Skip to content

Commit

Permalink
Rename simSoundEnabledProperty => audioEnabledProperty, see #864
Browse files Browse the repository at this point in the history
  • Loading branch information
samreid committed Sep 21, 2022
1 parent 433e145 commit 7b20772
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions js/preferences/AudioPreferencesPanel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class AudioPreferencesTabPanel extends VBox {
);
} );

const allAudioSwitch = new PreferencesToggleSwitch( audioModel.simSoundEnabledProperty, false, true, {
const allAudioSwitch = new PreferencesToggleSwitch( audioModel.audioEnabledProperty, false, true, {
labelNode: new Text( audioFeaturesString, PreferencesDialog.PANEL_SECTION_LABEL_OPTIONS ),
a11yLabel: audioFeaturesString
} );
Expand All @@ -82,7 +82,7 @@ class AudioPreferencesTabPanel extends VBox {
sections.enabled = enabled;
};

audioModel.simSoundEnabledProperty.link( soundEnabledListener );
audioModel.audioEnabledProperty.link( soundEnabledListener );

super( {
align: 'center',
Expand All @@ -100,7 +100,7 @@ class AudioPreferencesTabPanel extends VBox {
rightContent.children.forEach( child => child.dispose() );
allAudioSwitch.dispose();
disposeEmitter.emit();
audioModel.simSoundEnabledProperty.unlink( soundEnabledListener );
audioModel.audioEnabledProperty.unlink( soundEnabledListener );
};
}

Expand Down
6 changes: 3 additions & 3 deletions js/preferences/PreferencesModel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ export type AudioModel = BaseModelType & {

// When false, no audio features are heard. See audioManager.ts for documentation about audio and sub features.
// TODO: To be renamed to audioEnabledProperty, see https://github.com/phetsims/joist/issues/864
simSoundEnabledProperty: Property<boolean>;
audioEnabledProperty: Property<boolean>;
soundEnabledProperty: Property<boolean>;
extraSoundEnabledProperty: Property<boolean>;
voicingEnabledProperty: Property<boolean>;
Expand Down Expand Up @@ -263,7 +263,7 @@ export default class PreferencesModel extends PhetioObject {
supportsSound: options.audioOptions.supportsSound && audioEnabled,
supportsExtraSound: options.audioOptions.supportsExtraSound && audioEnabled,

simSoundEnabledProperty: audioManager.audioEnabledProperty,
audioEnabledProperty: audioManager.audioEnabledProperty,
soundEnabledProperty: soundManager.enabledProperty,
extraSoundEnabledProperty: soundManager.extraSoundEnabledProperty,

Expand Down Expand Up @@ -309,7 +309,7 @@ export default class PreferencesModel extends PhetioObject {
] );

this.addPhetioLinkedElementsForModel( options.tandem, this.audioModel, [
{ property: this.audioModel.simSoundEnabledProperty, tandemName: 'simSoundEnabledProperty' },
{ property: this.audioModel.audioEnabledProperty, tandemName: 'audioEnabledProperty' },
{ property: this.audioModel.soundEnabledProperty, tandemName: 'soundEnabledProperty' },
{ property: this.audioModel.extraSoundEnabledProperty, tandemName: 'extraSoundEnabledProperty' },
{ property: this.audioModel.voicingEnabledProperty, tandemName: 'voicingEnabledProperty' },
Expand Down

0 comments on commit 7b20772

Please sign in to comment.