Skip to content

Commit

Permalink
did some reorganization of the sounds directory, see #117
Browse files Browse the repository at this point in the history
  • Loading branch information
jbphet committed Feb 5, 2022
1 parent 99eee9d commit e77e816
Show file tree
Hide file tree
Showing 23 changed files with 125 additions and 107 deletions.
4 changes: 2 additions & 2 deletions js/demo/testing/model/AmplitudeModulatorDemo.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Copyright 2020-2021, University of Colorado Boulder

import saturatedSineLoop220Hz_mp3 from '../../../../sounds/saturatedSineLoop220Hz_mp3.js';
import windsLoopC3Oscilloscope_mp3 from '../../../../sounds/windsLoopC3Oscilloscope_mp3.js';
import windsLoopMiddleCOscilloscope_mp3 from '../../../../sounds/windsLoopMiddleCOscilloscope_mp3.js';
import windsLoopC3Oscilloscope_mp3 from '../../../../sounds/demo-and-test/windsLoopC3Oscilloscope_mp3.js';
import windsLoopMiddleCOscilloscope_mp3 from '../../../../sounds/demo-and-test/windsLoopMiddleCOscilloscope_mp3.js';
import AmplitudeModulator from '../../../AmplitudeModulator.js';
import SoundClip from '../../../sound-generators/SoundClip.js';
import SoundGenerator from '../../../sound-generators/SoundGenerator.js';
Expand Down
2 changes: 1 addition & 1 deletion js/demo/testing/view/CompositeSoundClipTestNode.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import PhetFont from '../../../../../scenery-phet/js/PhetFont.js';
import { VBox } from '../../../../../scenery/js/imports.js';
import TextPushButton from '../../../../../sun/js/buttons/TextPushButton.js';
import brightMarimba_mp3 from '../../../../sounds/brightMarimba_mp3.js';
import loonCall_mp3 from '../../../../sounds/loonCall_mp3.js';
import loonCall_mp3 from '../../../../sounds/demo-and-test/loonCall_mp3.js';
import SoundPlayer from '../../../SoundPlayer.js';
import CompositeSoundClip from '../../../sound-generators/CompositeSoundClip.js';
import soundManager from '../../../soundManager.js';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import { VBox } from '../../../../../scenery/js/imports.js';
import Checkbox from '../../../../../sun/js/Checkbox.js';
import Panel from '../../../../../sun/js/Panel.js';
import saturatedSineLoop220Hz_mp3 from '../../../../sounds/saturatedSineLoop220Hz_mp3.js';
import stringsLoopMiddleCOscilloscope_mp3 from '../../../../sounds/stringsLoopMiddleCOscilloscope_mp3.js';
import windsLoopC3Oscilloscope_mp3 from '../../../../sounds/windsLoopC3Oscilloscope_mp3.js';
import windsLoopMiddleCOscilloscope_mp3 from '../../../../sounds/windsLoopMiddleCOscilloscope_mp3.js';
import stringsLoopMiddleCOscilloscope_mp3 from '../../../../sounds/demo-and-test/stringsLoopMiddleCOscilloscope_mp3.js';
import windsLoopC3Oscilloscope_mp3 from '../../../../sounds/demo-and-test/windsLoopC3Oscilloscope_mp3.js';
import windsLoopMiddleCOscilloscope_mp3 from '../../../../sounds/demo-and-test/windsLoopMiddleCOscilloscope_mp3.js';
import ContinuousPropertySoundGenerator from '../../../sound-generators/ContinuousPropertySoundGenerator.js';
import soundManager from '../../../soundManager.js';
import tambo from '../../../tambo.js';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import TextPushButton from '../../../../../sun/js/buttons/TextPushButton.js';
import ComboBox from '../../../../../sun/js/ComboBox.js';
import ComboBoxItem from '../../../../../sun/js/ComboBoxItem.js';
import Panel from '../../../../../sun/js/Panel.js';
import birdCall_mp3 from '../../../../sounds/birdCall_mp3.js';
import cricketsLoop_mp3 from '../../../../sounds/cricketsLoop_mp3.js';
import birdCall_mp3 from '../../../../sounds/demo-and-test/birdCall_mp3.js';
import cricketsLoop_mp3 from '../../../../sounds/demo-and-test/cricketsLoop_mp3.js';
import PitchedPopGenerator from '../../../sound-generators/PitchedPopGenerator.js';
import SoundClip from '../../../sound-generators/SoundClip.js';
import soundManager from '../../../soundManager.js';
Expand Down
6 changes: 3 additions & 3 deletions js/demo/testing/view/TestingScreenView.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ import lightning_png from '../../../../images/lightning_png.js';
import brightMarimba_mp3 from '../../../../sounds/brightMarimba_mp3.js';
import checkboxChecked_mp3 from '../../../../sounds/checkboxChecked_mp3.js';
import emptyApartmentBedroom06Resampled_mp3 from '../../../../sounds/emptyApartmentBedroom06Resampled_mp3.js';
import loonCall_mp3 from '../../../../sounds/loonCall_mp3.js';
import rhodesChord_mp3 from '../../../../sounds/rhodesChord_mp3.js';
import loonCall_mp3 from '../../../../sounds/demo-and-test/loonCall_mp3.js';
import rhodesChord_mp3 from '../../../../sounds/demo-and-test/rhodesChord_mp3.js';
import sliderClick01_mp3 from '../../../../sounds/sliderClick01_mp3.js';
import sliderClick02_mp3 from '../../../../sounds/sliderClick02_mp3.js';
import thunder_mp3 from '../../../../sounds/thunder_mp3.js';
import thunder_mp3 from '../../../../sounds/demo-and-test/thunder_mp3.js';
import phetAudioContext from '../../../phetAudioContext.js';
import SoundClip from '../../../sound-generators/SoundClip.js';
import SoundLevelEnum from '../../../SoundLevelEnum.js';
Expand Down
File renamed without changes.
10 changes: 6 additions & 4 deletions sounds/birdCall_mp3.js → sounds/demo-and-test/birdCall_mp3.js

Large diffs are not rendered by default.

File renamed without changes.

Large diffs are not rendered by default.

66 changes: 66 additions & 0 deletions sounds/demo-and-test/license.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
{
"birdCall.mp3": {
"text": [
"Copyright 2002-2018 University of Colorado Boulder"
],
"projectURL": "https://phet.colorado.edu",
"license": "contact phethelp@colorado.edu",
"notes": "created by John Blanco (PhET)"
},
"cricketsLoop.mp3": {
"text": [
"Copyright 2002-2018 University of Colorado Boulder"
],
"projectURL": "https://phet.colorado.edu",
"license": "contact phethelp@colorado.edu",
"notes": "created by John Blanco (PhET)"
},
"loonCall.mp3": {
"text": [
"Copyright 2002-2018 University of Colorado Boulder"
],
"projectURL": "https://phet.colorado.edu",
"license": "contact phethelp@colorado.edu",
"notes": "created by John Blanco (PhET)"
},
"rhodesChord.mp3": {
"text": [
"Copyright 2002-2018 University of Colorado Boulder"
],
"projectURL": "https://phet.colorado.edu",
"license": "contact phethelp@colorado.edu",
"notes": "created by John Blanco (PhET)"
},
"stringsLoopMiddleCOscilloscope.mp3": {
"text": [
"Copyright 2019 University of Colorado Boulder"
],
"projectURL": "https://phet.colorado.edu",
"license": "contact phethelp@colorado.edu",
"notes": "created by Ashton Morris (PhET Interactive Simulations)"
},
"thunder.mp3": {
"text": [
"CC-BY"
],
"projectURL": "https://phet.colorado.edu",
"license": "contact phethelp@colorado.edu",
"notes": "see https://freesound.org/people/InspectorJ/sounds/360328/, note that author says no need to credit for non-commercial projects"
},
"windsLoopC3Oscilloscope.mp3": {
"text": [
"Copyright 2019 University of Colorado Boulder"
],
"projectURL": "https://phet.colorado.edu",
"license": "contact phethelp@colorado.edu",
"notes": "created by Ashton Morris (PhET Interactive Simulations)"
},
"windsLoopMiddleCOscilloscope.mp3": {
"text": [
"Copyright 2019 University of Colorado Boulder"
],
"projectURL": "https://phet.colorado.edu",
"license": "contact phethelp@colorado.edu",
"notes": "created by Ashton Morris (PhET Interactive Simulations)"
}
}
File renamed without changes.
10 changes: 6 additions & 4 deletions sounds/loonCall_mp3.js → sounds/demo-and-test/loonCall_mp3.js

Large diffs are not rendered by default.

File renamed without changes.

Large diffs are not rendered by default.

File renamed without changes.

Large diffs are not rendered by default.

File renamed without changes.
10 changes: 6 additions & 4 deletions sounds/thunder_mp3.js → sounds/demo-and-test/thunder_mp3.js

Large diffs are not rendered by default.

File renamed without changes.

Large diffs are not rendered by default.

File renamed without changes.

Large diffs are not rendered by default.

64 changes: 0 additions & 64 deletions sounds/license.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,6 @@
"license": "contact phethelp@colorado.edu",
"notes": "created by Ashton Morris (PhET Interactive Simulations)"
},
"birdCall.mp3": {
"text": [
"Copyright 2002-2018 University of Colorado Boulder"
],
"projectURL": "https://phet.colorado.edu",
"license": "contact phethelp@colorado.edu",
"notes": "created by John Blanco (PhET)"
},
"boundaryReached.mp3": {
"text": [
"Copyright 2002-2018 University of Colorado Boulder"
Expand Down Expand Up @@ -95,14 +87,6 @@
"license": "contact phethelp@colorado.edu",
"notes": "created by Ashton Morris (PhET Interactive Simulations)"
},
"cricketsLoop.mp3": {
"text": [
"Copyright 2002-2018 University of Colorado Boulder"
],
"projectURL": "https://phet.colorado.edu",
"license": "contact phethelp@colorado.edu",
"notes": "created by John Blanco (PhET)"
},
"emptyApartmentBedroom06Resampled.mp3": {
"text": [
"obtained from www.openairlib.net"
Expand Down Expand Up @@ -135,14 +119,6 @@
"license": "contact phethelp@colorado.edu",
"notes": "created by Ashton Morris (PhET Interactive Simulations)"
},
"loonCall.mp3": {
"text": [
"Copyright 2002-2018 University of Colorado Boulder"
],
"projectURL": "https://phet.colorado.edu",
"license": "contact phethelp@colorado.edu",
"notes": "created by John Blanco (PhET)"
},
"pause.mp3": {
"text": [
"Copyright 2002-2019 University of Colorado Boulder"
Expand Down Expand Up @@ -183,14 +159,6 @@
"license": "contact phethelp@colorado.edu",
"notes": "created by Ashton Morris (PhET Interactive Simulations)"
},
"rhodesChord.mp3": {
"text": [
"Copyright 2002-2018 University of Colorado Boulder"
],
"projectURL": "https://phet.colorado.edu",
"license": "contact phethelp@colorado.edu",
"notes": "created by John Blanco (PhET)"
},
"saturatedSineLoop220Hz.mp3": {
"text": [
"Copyright 2019 University of Colorado Boulder"
Expand Down Expand Up @@ -327,44 +295,12 @@
"license": "contact phethelp@colorado.edu",
"notes": "created by Ashton Morris (PhET Interactive Simulations)"
},
"stringsLoopMiddleCOscilloscope.mp3": {
"text": [
"Copyright 2019 University of Colorado Boulder"
],
"projectURL": "https://phet.colorado.edu",
"license": "contact phethelp@colorado.edu",
"notes": "created by Ashton Morris (PhET Interactive Simulations)"
},
"thunder.mp3": {
"text": [
"CC-BY"
],
"projectURL": "https://phet.colorado.edu",
"license": "contact phethelp@colorado.edu",
"notes": "see https://freesound.org/people/InspectorJ/sounds/360328/, note that author says no need to credit for non-commercial projects"
},
"wallContact.mp3": {
"text": [
"Copyright 2002-2018 University of Colorado Boulder"
],
"projectURL": "https://phet.colorado.edu",
"license": "contact phethelp@colorado.edu",
"notes": "created by Mike Winters (Georgia Tech) for use by PhET"
},
"windsLoopC3Oscilloscope.mp3": {
"text": [
"Copyright 2019 University of Colorado Boulder"
],
"projectURL": "https://phet.colorado.edu",
"license": "contact phethelp@colorado.edu",
"notes": "created by Ashton Morris (PhET Interactive Simulations)"
},
"windsLoopMiddleCOscilloscope.mp3": {
"text": [
"Copyright 2019 University of Colorado Boulder"
],
"projectURL": "https://phet.colorado.edu",
"license": "contact phethelp@colorado.edu",
"notes": "created by Ashton Morris (PhET Interactive Simulations)"
}
}

0 comments on commit e77e816

Please sign in to comment.