remove TODO and lastStaccatoSoundValue, #127

js/common/model/RAPRatioTuple.js

@@ -2,7 +2,6 @@
 
 /**
  * Data type that holds both terms of the ratio
- * // TODO: use Poolable? https://github.com/phetsims/ratio-and-proportion/issues/181
  * @author Michael Kauzmann (PhET Interactive Simulations)
  */
 

js/common/view/sound/MovingInProportionSoundGenerator.js

@@ -29,22 +29,20 @@ class MovingInProportionSoundGenerator extends SoundGenerator {
     // @private {SoundClip|MultiSoundClip|null} - null when no sound
     this.movingInProportionSoundClip = null;
 
-    this.movingInProportionSoundClip = new MultiSoundClip( [
-      {
-        sound: choirAhhSound,
-        options: {
-          loop: true,
-          trimSilence: true
-        }
-      }, {
-        sound: movingInProportionOption4,
-        options: {
-          loop: true,
-          initialOutputLevel: .6,
-          trimSilence: true
-        }
+    this.movingInProportionSoundClip = new MultiSoundClip( [ {
+      sound: choirAhhSound,
+      options: {
+        loop: true,
+        trimSilence: true
       }
-    ] );
+    }, {
+      sound: movingInProportionOption4,
+      options: {
+        loop: true,
+        initialOutputLevel: .6,
+        trimSilence: true
+      }
+    } ] );
     this.movingInProportionSoundClip.connect( this.soundSourceDestination );
 
     Property.multilink( [

js/common/view/sound/StaccatoFrequencySoundGenerator.js

@@ -92,10 +92,6 @@ class StaccatoFrequencySoundGenerator extends SoundGenerator {
 
     // @private - in ms, keep track of the amount of time that has passed since the last staccato sound played
     this.timeSinceLastPlay = 0;
-
-    // @private {number} - keep track of the last value to prevent the same sound from being played twice in a row.
-    // TODO: do we need this, or would it be ok to repeat these sounds sometimes?
-    this.lastStaccatoSoundValue = -1;
   }
 
   /**
@@ -112,29 +108,11 @@ class StaccatoFrequencySoundGenerator extends SoundGenerator {
     const isInRatio = this.isInProportion();
     if ( this.timeSinceLastPlay > this.timeLinearFunction( newFitness ) && !isInRatio && newFitness > 0 ) {
       const sounds = this.staccatoSoundClips[ Math.floor( newFitness * this.staccatoSoundClips.length ) ];
-      sounds[ this.getStaccatoSoundValueToPlay() ].play();
+      sounds[ Math.floor( phet.joist.random.nextDouble() * sounds.length ) ].play();
       this.timeSinceLastPlay = 0;
     }
   }
 
-  /**
-   * Get the value of the MultiClip map for the staccato sound to play, see "staccatoSoundMap"
-   * @returns {number}
-   * @private
-   */
-  getStaccatoSoundValueToPlay() {
-
-    let soundValue = this.lastStaccatoSoundValue;
-    while ( soundValue === this.lastStaccatoSoundValue ) {
-
-      // "3 + 1" is a hard coded number based on staccatoSoundMap
-      soundValue = Math.floor( phet.joist.random.nextDouble() * 3 );
-    }
-
-    this.lastStaccatoSoundValue = soundValue;
-    return soundValue;
-  }
-
   /**
    * stop any in-progress sound generation
    * @public