rename simSoundEnabledProperty in this sim to something more sim spec…

…ific, see phetsims/joist#864
phetsims · Sep 21, 2022 · b8f6abd · b8f6abd
1 parent 5cf0952
commit b8f6abd
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 15 deletions.
diff --git a/js/quadrilateral/view/ShapeSoundCheckbox.ts b/js/quadrilateral/view/ShapeSoundCheckbox.ts
@@ -22,8 +22,8 @@ const shapeSoundControlDisabledContextResponse = QuadrilateralStrings.a11y.voici
 const shapeSoundControlNameResponse = QuadrilateralStrings.a11y.voicing.shapeSoundControl.nameResponse;
 
 class ShapeSoundCheckbox extends Checkbox {
-  public constructor( simSoundEnabledProperty: Property<boolean>, tandem: Tandem ) {
-    super( simSoundEnabledProperty, QuadrilateralIconFactory.createSoundIcon(), {
+  public constructor( shapeSoundEnabledProperty: Property<boolean>, tandem: Tandem ) {
+    super( shapeSoundEnabledProperty, QuadrilateralIconFactory.createSoundIcon(), {
       voicingNameResponse: shapeSoundControlNameResponse,
       checkedContextResponse: shapeSoundControlEnabledContextResponse,
       uncheckedContextResponse: shapeSoundControlDisabledContextResponse,

diff --git a/js/quadrilateral/view/sound/TracksArpeggioSoundView.ts b/js/quadrilateral/view/sound/TracksArpeggioSoundView.ts
@@ -93,8 +93,8 @@ const NAMED_QUADRILATERAL_TO_BACKGROUND_TRACKS_MAP = new Map( [
 class TracksArpeggioSoundView extends TracksSoundView {
   private readonly disposeTracksArpeggioSoundView: () => void;
 
-  public constructor( shapeModel: QuadrilateralShapeModel, simSoundEnabledProperty: TReadOnlyProperty<boolean>, resetNotInProgressProperty: TReadOnlyProperty<boolean>, soundOptionsModel: QuadrilateralSoundOptionsModel ) {
-    super( shapeModel, simSoundEnabledProperty, resetNotInProgressProperty, soundOptionsModel, ARPEGGIO_TRACKS );
+  public constructor( shapeModel: QuadrilateralShapeModel, shapeSoundEnabledProperty: TReadOnlyProperty<boolean>, resetNotInProgressProperty: TReadOnlyProperty<boolean>, soundOptionsModel: QuadrilateralSoundOptionsModel ) {
+    super( shapeModel, shapeSoundEnabledProperty, resetNotInProgressProperty, soundOptionsModel, ARPEGGIO_TRACKS );
 
     const shapeNameListener = ( shapeName: NamedQuadrilateral ) => {
 

diff --git a/js/quadrilateral/view/sound/TracksBuildUpSoundView.ts b/js/quadrilateral/view/sound/TracksBuildUpSoundView.ts
@@ -84,14 +84,14 @@ type TracksBuildUpSoundViewOptions = {
 class TracksBuildUpSoundView extends TracksSoundView {
   private readonly disposeTracksBuildUpSoundView: () => void;
 
-  public constructor( shapeModel: QuadrilateralShapeModel, simSoundEnabledProperty: TReadOnlyProperty<boolean>, resetNotInProgressProperty: TReadOnlyProperty<boolean>, soundOptionsModel: QuadrilateralSoundOptionsModel, providedOptions?: TracksBuildUpSoundViewOptions ) {
+  public constructor( shapeModel: QuadrilateralShapeModel, shapeSoundEnabledProperty: TReadOnlyProperty<boolean>, resetNotInProgressProperty: TReadOnlyProperty<boolean>, soundOptionsModel: QuadrilateralSoundOptionsModel, providedOptions?: TracksBuildUpSoundViewOptions ) {
 
     const options = optionize<TracksBuildUpSoundViewOptions>()( {
       simple: false
     }, providedOptions );
 
     const tracks = options.simple ? BUILD_UP_TRACKS_SIMPLE : BUILD_UP_TRACKS;
-    super( shapeModel, simSoundEnabledProperty, resetNotInProgressProperty, soundOptionsModel, tracks );
+    super( shapeModel, shapeSoundEnabledProperty, resetNotInProgressProperty, soundOptionsModel, tracks );
 
     const shapeNameListener = ( shapeName: NamedQuadrilateral ) => {
 

diff --git a/js/quadrilateral/view/sound/TracksMelodyMappingSoundView.ts b/js/quadrilateral/view/sound/TracksMelodyMappingSoundView.ts
@@ -51,9 +51,8 @@ const NAMED_QUADRILATERAL_TO_TRACKS_MAP = new Map( [
 class TracksMelodyMappingSoundView extends TracksSoundView {
   private readonly disposeTracksMelodyMappingSoundView: () => void;
 
-  public constructor( shapeModel: QuadrilateralShapeModel, simSoundEnabledProperty: TReadOnlyProperty<boolean>, resetNotInProgressProperty: TReadOnlyProperty<boolean>, soundOptionsModel: QuadrilateralSoundOptionsModel ) {
-
-    super( shapeModel, simSoundEnabledProperty, resetNotInProgressProperty, soundOptionsModel, MELODY_MAPPING_TRACKS );
+  public constructor( shapeModel: QuadrilateralShapeModel, shapeSoundEnabledProperty: TReadOnlyProperty<boolean>, resetNotInProgressProperty: TReadOnlyProperty<boolean>, soundOptionsModel: QuadrilateralSoundOptionsModel ) {
+    super( shapeModel, shapeSoundEnabledProperty, resetNotInProgressProperty, soundOptionsModel, MELODY_MAPPING_TRACKS );
 
     const shapeNameListener = ( shapeName: NamedQuadrilateral ) => {
 

diff --git a/js/quadrilateral/view/sound/TracksMelodySoundView.ts b/js/quadrilateral/view/sound/TracksMelodySoundView.ts
@@ -76,14 +76,14 @@ type TracksMelodySoundViewOptions = {
 class TracksMelodySoundView extends TracksSoundView {
   private readonly disposeTracksMelodySoundView: () => void;
 
-  public constructor( shapeModel: QuadrilateralShapeModel, simSoundEnabledProperty: TReadOnlyProperty<boolean>, resetNotInProgressProperty: TReadOnlyProperty<boolean>, soundOptionsModel: QuadrilateralSoundOptionsModel, providedOptions?: TracksMelodySoundViewOptions ) {
+  public constructor( shapeModel: QuadrilateralShapeModel, shapeSoundEnabledProperty: TReadOnlyProperty<boolean>, resetNotInProgressProperty: TReadOnlyProperty<boolean>, soundOptionsModel: QuadrilateralSoundOptionsModel, providedOptions?: TracksMelodySoundViewOptions ) {
 
     const options = optionize<TracksMelodySoundViewOptions>()( {
       simple: false
     }, providedOptions );
 
     const tracks = options.simple ? SIMPLE_MELODY_TRACKS : MELODY_TRACKS;
-    super( shapeModel, simSoundEnabledProperty, resetNotInProgressProperty, soundOptionsModel, tracks );
+    super( shapeModel, shapeSoundEnabledProperty, resetNotInProgressProperty, soundOptionsModel, tracks );
 
     const shapeNameListener = ( shapeName: NamedQuadrilateral ) => {
 

diff --git a/js/quadrilateral/view/sound/TracksSoundView.ts b/js/quadrilateral/view/sound/TracksSoundView.ts
@@ -67,11 +67,11 @@ class TracksSoundView extends SoundGenerator {
   // is stopped or currently fading out.
   private shapeDirty = false;
 
-  public constructor( shapeModel: QuadrilateralShapeModel, simSoundEnabledProperty: TReadOnlyProperty<boolean>, resetNotInProgressProperty: TReadOnlyProperty<boolean>, soundOptionsModel: QuadrilateralSoundOptionsModel, tracks: WrappedAudioBuffer[] ) {
+  public constructor( shapeModel: QuadrilateralShapeModel, shapeSoundEnabledProperty: TReadOnlyProperty<boolean>, resetNotInProgressProperty: TReadOnlyProperty<boolean>, soundOptionsModel: QuadrilateralSoundOptionsModel, tracks: WrappedAudioBuffer[] ) {
     super( {
 
       // don't play sounds while model reset is in progress or when the user has opted out of playing music tracks
-      enableControlProperties: [ resetNotInProgressProperty, simSoundEnabledProperty ],
+      enableControlProperties: [ resetNotInProgressProperty, shapeSoundEnabledProperty ],
 
       // No sound from this track set initially
       initialOutputLevel: 0

diff --git a/js/quadrilateral/view/sound/TracksVolumeEmphasisSoundView.ts b/js/quadrilateral/view/sound/TracksVolumeEmphasisSoundView.ts
@@ -59,8 +59,8 @@ const NAMED_QUADRILATERAL_TO_HIGH_VOLUME_TRACKS_MAP = new Map( [
 ] );
 
 class TracksVolumeEmphasisSoundView extends TracksSoundView {
-  public constructor( shapeModel: QuadrilateralShapeModel, simSoundEnabledProperty: TReadOnlyProperty<boolean>, resetNotInProgressProperty: TReadOnlyProperty<boolean>, soundOptionsModel: QuadrilateralSoundOptionsModel ) {
-    super( shapeModel, simSoundEnabledProperty, resetNotInProgressProperty, soundOptionsModel, VOLUME_EMPHASIS_TRACKS );
+  public constructor( shapeModel: QuadrilateralShapeModel, shapeSoundEnabledProperty: TReadOnlyProperty<boolean>, resetNotInProgressProperty: TReadOnlyProperty<boolean>, soundOptionsModel: QuadrilateralSoundOptionsModel ) {
+    super( shapeModel, shapeSoundEnabledProperty, resetNotInProgressProperty, soundOptionsModel, VOLUME_EMPHASIS_TRACKS );
 
     const shapeNameListener = ( shapeName: NamedQuadrilateral ) => {