replace enableControlProperties with enabledProperty, mute sounds dur…

…ing reset by default, & other sound lib API improvements, see phetsims/tambo#189
phetsims · Jul 12, 2024 · 9f7a7f2 · 9f7a7f2
1 parent a214785
commit 9f7a7f2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/js/discrete/view/DiscreteScreenView.ts b/js/discrete/view/DiscreteScreenView.ts
@@ -56,10 +56,8 @@ export default class DiscreteScreenView extends ScreenView {
     //------------------------------------------------------------------------------------------------------------------
 
     // Sound for the Fourier series
-    const fourierSoundGenerator = new FourierSoundGenerator( model.fourierSeries );
-    soundManager.addSoundGenerator( fourierSoundGenerator, {
-      associatedViewNode: this
-    } );
+    const fourierSoundGenerator = new FourierSoundGenerator( model.fourierSeries, this );
+    soundManager.addSoundGenerator( fourierSoundGenerator );
 
     //------------------------------------------------------------------------------------------------------------------
     // Amplitudes chart

diff --git a/js/discrete/view/FourierSoundGenerator.ts b/js/discrete/view/FourierSoundGenerator.ts
@@ -16,19 +16,21 @@ import soundManager from '../../../../tambo/js/soundManager.js';
 import FMWConstants from '../../common/FMWConstants.js';
 import FourierSeries from '../../common/model/FourierSeries.js';
 import fourierMakingWaves from '../../fourierMakingWaves.js';
+import { Node } from '../../../../scenery/js/imports.js';
 
 // Output level range of each harmonic. These have a reduced range because harmonics are summed.
 // See https://github.com/phetsims/fourier-making-waves/issues/45
 const HARMONIC_OUTPUT_LEVEL_RANGE = new Range( -1 / FMWConstants.MAX_HARMONICS, 1 / FMWConstants.MAX_HARMONICS );
 
 export default class FourierSoundGenerator extends SoundGenerator {
 
-  public constructor( fourierSeries: FourierSeries ) {
+  public constructor( fourierSeries: FourierSeries, associatedViewNode: Node ) {
 
     super( {
 
       // SoundGeneratorOptions
-      initialOutputLevel: fourierSeries.soundOutputLevelProperty.value
+      initialOutputLevel: fourierSeries.soundOutputLevelProperty.value,
+      associatedViewNode: associatedViewNode
     } );
 
     // Maps amplitude to an output level that is appropriate for SoundGenerator.
@@ -74,7 +76,7 @@ export default class FourierSoundGenerator extends SoundGenerator {
       this.setOutputLevel( outputLevel, timeConstant );
     } );
 
-    // Turn sound on/off. We could have controlled this via options.enableControlProperties,
+    // Turn sound on/off. We could have controlled this via options.enabledProperty,
     // but stopping OscillatorSoundGenerators may use fewer resources.
     fourierSeries.soundEnabledProperty.link( enabled => {
       if ( enabled ) {