rename staccato and in-proportion sound files, #191

js/common/view/sound/InProportionSoundGenerator.js

@@ -7,7 +7,7 @@
 
 import merge from '../../../../../phet-core/js/merge.js';
 import SoundClip from '../../../../../tambo/js/sound-generators/SoundClip.js';
-import inProportionQuickFade from '../../../../sounds/in-proportion/in-proportion-quick-fade_mp3.js';
+import inProportionSound from '../../../../sounds/in-proportion/in-proportion_mp3.js';
 import ratioAndProportion from '../../../ratioAndProportion.js';
 import RAPQueryParameters from '../../RAPQueryParameters.js';
 
@@ -27,7 +27,7 @@ class InProportionSoundGenerator extends SoundClip {
       initialOutputLevel: .5
     }, options );
 
-    super( inProportionQuickFade, options );
+    super( inProportionSound, options );
 
     // @private
     this.model = model;

js/common/view/sound/StaccatoFrequencySoundGenerator.js

@@ -9,30 +9,30 @@ import LinearFunction from '../../../../../dot/js/LinearFunction.js';
 import merge from '../../../../../phet-core/js/merge.js';
 import SoundClip from '../../../../../tambo/js/sound-generators/SoundClip.js';
 import SoundGenerator from '../../../../../tambo/js/sound-generators/SoundGenerator.js';
-import c001Sound from '../../../../sounds/staccato/marimba-variation-v2-c-001_mp3.js';
-import c002Sound from '../../../../sounds/staccato/marimba-variation-v2-c-002_mp3.js';
-import cSharp001Sound from '../../../../sounds/staccato/marimba-variation-v2-c-sharp-001_mp3.js';
-import cSharp002Sound from '../../../../sounds/staccato/marimba-variation-v2-c-sharp-002_mp3.js';
-import cSharpSound from '../../../../sounds/staccato/marimba-variation-v2-c-sharp_mp3.js';
-import cSound from '../../../../sounds/staccato/marimba-variation-v2-c_mp3.js';
-import d001Sound from '../../../../sounds/staccato/marimba-variation-v2-d-001_mp3.js';
-import d002Sound from '../../../../sounds/staccato/marimba-variation-v2-d-002_mp3.js';
-import dSharp001Sound from '../../../../sounds/staccato/marimba-variation-v2-d-sharp-001_mp3.js';
-import dSharp002Sound from '../../../../sounds/staccato/marimba-variation-v2-d-sharp-002_mp3.js';
-import dSharpSound from '../../../../sounds/staccato/marimba-variation-v2-d-sharp_mp3.js';
-import dSound from '../../../../sounds/staccato/marimba-variation-v2-d_mp3.js';
-import e001Sound from '../../../../sounds/staccato/marimba-variation-v2-e-001_mp3.js';
-import e002Sound from '../../../../sounds/staccato/marimba-variation-v2-e-002_mp3.js';
-import eSound from '../../../../sounds/staccato/marimba-variation-v2-e_mp3.js';
-import f001Sound from '../../../../sounds/staccato/marimba-variation-v2-f-001_mp3.js';
-import f002Sound from '../../../../sounds/staccato/marimba-variation-v2-f-002_mp3.js';
-import fSharp001Sound from '../../../../sounds/staccato/marimba-variation-v2-f-sharp-001_mp3.js';
-import fSharp002Sound from '../../../../sounds/staccato/marimba-variation-v2-f-sharp-002_mp3.js';
-import fSharpSound from '../../../../sounds/staccato/marimba-variation-v2-f-sharp_mp3.js';
-import fSound from '../../../../sounds/staccato/marimba-variation-v2-f_mp3.js';
-import g001Sound from '../../../../sounds/staccato/marimba-variation-v2-g-001_mp3.js';
-import g002Sound from '../../../../sounds/staccato/marimba-variation-v2-g-002_mp3.js';
-import gSound from '../../../../sounds/staccato/marimba-variation-v2-g_mp3.js';
+import c001Sound from '../../../../sounds/staccato/staccato-c-001_mp3.js';
+import c002Sound from '../../../../sounds/staccato/staccato-c-002_mp3.js';
+import cSharp001Sound from '../../../../sounds/staccato/staccato-c-sharp-001_mp3.js';
+import cSharp002Sound from '../../../../sounds/staccato/staccato-c-sharp-002_mp3.js';
+import cSharpSound from '../../../../sounds/staccato/staccato-c-sharp_mp3.js';
+import cSound from '../../../../sounds/staccato/staccato-c_mp3.js';
+import d001Sound from '../../../../sounds/staccato/staccato-d-001_mp3.js';
+import d002Sound from '../../../../sounds/staccato/staccato-d-002_mp3.js';
+import dSharp001Sound from '../../../../sounds/staccato/staccato-d-sharp-001_mp3.js';
+import dSharp002Sound from '../../../../sounds/staccato/staccato-d-sharp-002_mp3.js';
+import dSharpSound from '../../../../sounds/staccato/staccato-d-sharp_mp3.js';
+import dSound from '../../../../sounds/staccato/staccato-d_mp3.js';
+import e001Sound from '../../../../sounds/staccato/staccato-e-001_mp3.js';
+import e002Sound from '../../../../sounds/staccato/staccato-e-002_mp3.js';
+import eSound from '../../../../sounds/staccato/staccato-e_mp3.js';
+import f001Sound from '../../../../sounds/staccato/staccato-f-001_mp3.js';
+import f002Sound from '../../../../sounds/staccato/staccato-f-002_mp3.js';
+import fSharp001Sound from '../../../../sounds/staccato/staccato-f-sharp-001_mp3.js';
+import fSharp002Sound from '../../../../sounds/staccato/staccato-f-sharp-002_mp3.js';
+import fSharpSound from '../../../../sounds/staccato/staccato-f-sharp_mp3.js';
+import fSound from '../../../../sounds/staccato/staccato-f_mp3.js';
+import g001Sound from '../../../../sounds/staccato/staccato-g-001_mp3.js';
+import g002Sound from '../../../../sounds/staccato/staccato-g-002_mp3.js';
+import gSound from '../../../../sounds/staccato/staccato-g_mp3.js';
 import ratioAndProportion from '../../../ratioAndProportion.js';
 
 // organize the sounds by variation and note

sounds/in-proportion/license.json

@@ -1,5 +1,5 @@
 {
-  "in-proportion-quick-fade.mp3": {
+  "in-proportion.mp3": {
     "text": [
       "Copyright 2020 University of Colorado Boulder"
     ],

sounds/staccato/license.json

@@ -1,189 +1,189 @@
 {
-  "marimba-variation-v2-d-sharp.mp3": {
+  "staccato-d-sharp.mp3": {
     "text": [
       "Copyright 2020 University of Colorado Boulder"
     ],
     "projectURL": "http://phet.colorado.edu",
     "license": "contact [email protected]",
     "notes": "created by Ashton Morris (PhET Interactive Simulations)"
   },
-  "marimba-variation-v2-d-sharp-001.mp3": {
+  "staccato-d-sharp-001.mp3": {
     "text": [
       "Copyright 2020 University of Colorado Boulder"
     ],
     "projectURL": "http://phet.colorado.edu",
     "license": "contact [email protected]",
     "notes": "created by Ashton Morris (PhET Interactive Simulations)"
   },
-  "marimba-variation-v2-d-001.mp3": {
+  "staccato-d-001.mp3": {
     "text": [
       "Copyright 2020 University of Colorado Boulder"
     ],
     "projectURL": "http://phet.colorado.edu",
     "license": "contact [email protected]",
     "notes": "created by Ashton Morris (PhET Interactive Simulations)"
   },
-  "marimba-variation-v2-c-001.mp3": {
+  "staccato-c-001.mp3": {
     "text": [
       "Copyright 2020 University of Colorado Boulder"
     ],
     "projectURL": "http://phet.colorado.edu",
     "license": "contact [email protected]",
     "notes": "created by Ashton Morris (PhET Interactive Simulations)"
   },
-  "marimba-variation-v2-d.mp3": {
+  "staccato-d.mp3": {
     "text": [
       "Copyright 2020 University of Colorado Boulder"
     ],
     "projectURL": "http://phet.colorado.edu",
     "license": "contact [email protected]",
     "notes": "created by Ashton Morris (PhET Interactive Simulations)"
   },
-  "marimba-variation-v2-c-sharp-001.mp3": {
+  "staccato-c-sharp-001.mp3": {
     "text": [
       "Copyright 2020 University of Colorado Boulder"
     ],
     "projectURL": "http://phet.colorado.edu",
     "license": "contact [email protected]",
     "notes": "created by Ashton Morris (PhET Interactive Simulations)"
   },
-  "marimba-variation-v2-e-001.mp3": {
+  "staccato-e-001.mp3": {
     "text": [
       "Copyright 2020 University of Colorado Boulder"
     ],
     "projectURL": "http://phet.colorado.edu",
     "license": "contact [email protected]",
     "notes": "created by Ashton Morris (PhET Interactive Simulations)"
   },
-  "marimba-variation-v2-c-sharp.mp3": {
+  "staccato-c-sharp.mp3": {
     "text": [
       "Copyright 2020 University of Colorado Boulder"
     ],
     "projectURL": "http://phet.colorado.edu",
     "license": "contact [email protected]",
     "notes": "created by Ashton Morris (PhET Interactive Simulations)"
   },
-  "marimba-variation-v2-c-sharp-002.mp3": {
+  "staccato-c-sharp-002.mp3": {
     "text": [
       "Copyright 2020 University of Colorado Boulder"
     ],
     "projectURL": "http://phet.colorado.edu",
     "license": "contact [email protected]",
     "notes": "created by Ashton Morris (PhET Interactive Simulations)"
   },
-  "marimba-variation-v2-c-002.mp3": {
+  "staccato-c-002.mp3": {
     "text": [
       "Copyright 2020 University of Colorado Boulder"
     ],
     "projectURL": "http://phet.colorado.edu",
     "license": "contact [email protected]",
     "notes": "created by Ashton Morris (PhET Interactive Simulations)"
   },
-  "marimba-variation-v2-d-002.mp3": {
+  "staccato-d-002.mp3": {
     "text": [
       "Copyright 2020 University of Colorado Boulder"
     ],
     "projectURL": "http://phet.colorado.edu",
     "license": "contact [email protected]",
     "notes": "created by Ashton Morris (PhET Interactive Simulations)"
   },
-  "marimba-variation-v2-c.mp3": {
+  "staccato-c.mp3": {
     "text": [
       "Copyright 2020 University of Colorado Boulder"
     ],
     "projectURL": "http://phet.colorado.edu",
     "license": "contact [email protected]",
     "notes": "created by Ashton Morris (PhET Interactive Simulations)"
   },
-  "marimba-variation-v2-d-sharp-002.mp3": {
+  "staccato-d-sharp-002.mp3": {
     "text": [
       "Copyright 2020 University of Colorado Boulder"
     ],
     "projectURL": "http://phet.colorado.edu",
     "license": "contact [email protected]",
     "notes": "created by Ashton Morris (PhET Interactive Simulations)"
   },
-  "marimba-variation-v2-f-002.mp3": {
+  "staccato-f-002.mp3": {
     "text": [
       "Copyright 2020 University of Colorado Boulder"
     ],
     "projectURL": "http://phet.colorado.edu",
     "license": "contact [email protected]",
     "notes": "created by Ashton Morris (PhET Interactive Simulations)"
   },
-  "marimba-variation-v2-e-002.mp3": {
+  "staccato-e-002.mp3": {
     "text": [
       "Copyright 2020 University of Colorado Boulder"
     ],
     "projectURL": "http://phet.colorado.edu",
     "license": "contact [email protected]",
     "notes": "created by Ashton Morris (PhET Interactive Simulations)"
   },
-  "marimba-variation-v2-g-002.mp3": {
+  "staccato-g-002.mp3": {
     "text": [
       "Copyright 2020 University of Colorado Boulder"
     ],
     "projectURL": "http://phet.colorado.edu",
     "license": "contact [email protected]",
     "notes": "created by Ashton Morris (PhET Interactive Simulations)"
   },
-  "marimba-variation-v2-g.mp3": {
+  "staccato-g.mp3": {
     "text": [
       "Copyright 2020 University of Colorado Boulder"
     ],
     "projectURL": "http://phet.colorado.edu",
     "license": "contact [email protected]",
     "notes": "created by Ashton Morris (PhET Interactive Simulations)"
   },
-  "marimba-variation-v2-f.mp3": {
+  "staccato-f.mp3": {
     "text": [
       "Copyright 2020 University of Colorado Boulder"
     ],
     "projectURL": "http://phet.colorado.edu",
     "license": "contact [email protected]",
     "notes": "created by Ashton Morris (PhET Interactive Simulations)"
   },
-  "marimba-variation-v2-e.mp3": {
+  "staccato-e.mp3": {
     "text": [
       "Copyright 2020 University of Colorado Boulder"
     ],
     "projectURL": "http://phet.colorado.edu",
     "license": "contact [email protected]",
     "notes": "created by Ashton Morris (PhET Interactive Simulations)"
   },
-  "marimba-variation-v2-f-sharp-001.mp3": {
+  "staccato-f-sharp-001.mp3": {
     "text": [
       "Copyright 2020 University of Colorado Boulder"
     ],
     "projectURL": "http://phet.colorado.edu",
     "license": "contact [email protected]",
     "notes": "created by Ashton Morris (PhET Interactive Simulations)"
   },
-  "marimba-variation-v2-f-sharp-002.mp3": {
+  "staccato-f-sharp-002.mp3": {
     "text": [
       "Copyright 2020 University of Colorado Boulder"
     ],
     "projectURL": "http://phet.colorado.edu",
     "license": "contact [email protected]",
     "notes": "created by Ashton Morris (PhET Interactive Simulations)"
   },
-  "marimba-variation-v2-g-001.mp3": {
+  "staccato-g-001.mp3": {
     "text": [
       "Copyright 2020 University of Colorado Boulder"
     ],
     "projectURL": "http://phet.colorado.edu",
     "license": "contact [email protected]",
     "notes": "created by Ashton Morris (PhET Interactive Simulations)"
   },
-  "marimba-variation-v2-f-sharp.mp3": {
+  "staccato-f-sharp.mp3": {
     "text": [
       "Copyright 2020 University of Colorado Boulder"
     ],
     "projectURL": "http://phet.colorado.edu",
     "license": "contact [email protected]",
     "notes": "created by Ashton Morris (PhET Interactive Simulations)"
   },
-  "marimba-variation-v2-f-001.mp3": {
+  "staccato-f-001.mp3": {
     "text": [
       "Copyright 2020 University of Colorado Boulder"
     ],