SettingsView now sets the AudioManager.MasterSongVolume

vchelaru · Jan 28, 2024 · 5c34e35 · 5c34e35
1 parent a7fe26a
commit 5c34e35
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Engines/FlatRedBallXNA/FlatRedBall/Audio/AudioManager.cs b/Engines/FlatRedBallXNA/FlatRedBall/Audio/AudioManager.cs
@@ -64,6 +64,10 @@ public static float MasterSoundVolume
         } = 1.0f;
 
         static float? masterSongVolume = null;
+
+        /// <summary>
+        /// The default volume for playing songs, applied when calling Play(Song). Ranges between 0 and 1.
+        /// </summary>
         public static float? MasterSongVolume
         {
             get => masterSongVolume;

diff --git a/Engines/Forms/FlatRedBall.Forms/FlatRedBall.Forms.Shared/Controls/Games/SettingsView.cs b/Engines/Forms/FlatRedBall.Forms/FlatRedBall.Forms.Shared/Controls/Games/SettingsView.cs
@@ -130,8 +130,9 @@ private void HandleMusicValueChanged(object sender, EventArgs e)
             if(IsAutoApplyingChangesToEngine)
             {
 #if !__IOS__
-
-                MediaPlayer.Volume = (float)MusicVolumePercentage / 100;
+                // MediaPlayer.Volume is handled by AudioManager.MasterSongVolume
+                //MediaPlayer.Volume = (float)MusicVolumePercentage / 100;
+                AudioManager.MasterSongVolume = (float)MusicVolumePercentage / 100;
 #endif
             }