From f9f9f076b419157efe51ec100232918f179c1c0e Mon Sep 17 00:00:00 2001
From: mothbeanie <shinywolf07ontheinternets@gmail.com>
Date: Sat, 14 Dec 2024 17:29:52 -0800
Subject: [PATCH] musicVolume -> controlVolume for clarity

---
 desktop_version/src/Music.cpp | 26 +++++++++++++-------------
 desktop_version/src/Music.h   |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/desktop_version/src/Music.cpp b/desktop_version/src/Music.cpp
index 7e172b7a..2e2ba84e 100644
--- a/desktop_version/src/Music.cpp
+++ b/desktop_version/src/Music.cpp
@@ -504,9 +504,9 @@ end:
         }
     }
 
-    static void SetVolume(int musicVolume)
+    static void SetVolume(int controlVolume)
     {
-        float adj_vol = (float) musicVolume / VVV_MAX_VOLUME;
+        float adj_vol = (float)controlVolume / VVV_MAX_VOLUME;
         if (!IsHalted())
         {
             FAudioVoice_SetVolume(musicVoice, adj_vol, FAUDIO_COMMIT_NOW);
@@ -715,7 +715,7 @@ musicclass::musicclass(void)
     safeToProcessMusic= false;
     m_doFadeInVol = false;
     m_doFadeOutVol = false;
-    musicVolume = 0;
+    controlVolume = 0;
 
     user_music_volume = USER_VOLUME_MAX;
     user_sound_volume = USER_VOLUME_MAX;
@@ -971,8 +971,8 @@ void musicclass::play(int t)
         {
             m_doFadeInVol = false;
             m_doFadeOutVol = false;
-            musicVolume = VVV_MAX_VOLUME;
-            set_music_volume(musicVolume);
+            controlVolume = VVV_MAX_VOLUME;
+            set_music_volume(controlVolume);
         }
     }
     else
@@ -1050,7 +1050,7 @@ void musicclass::haltdasmusik(const bool from_fade)
 
 void musicclass::silencedasmusik(void)
 {
-    musicVolume = 0;
+    controlVolume = 0;
     m_doFadeInVol = false;
     m_doFadeOutVol = false;
 }
@@ -1107,7 +1107,7 @@ void musicclass::fadeMusicVolumeIn(int ms)
     m_doFadeOutVol = false;
 
     /* Ensure it starts at 0 */
-    musicVolume = 0;
+    controlVolume = 0;
 
     /* Fix 1-frame glitch */
     set_music_volume(0);
@@ -1130,8 +1130,8 @@ void musicclass::fadeMusicVolumeOut(const int fadeout_ms)
 
     fade.step_ms = 0;
     /* Duration is proportional to current volume. */
-    fade.duration_ms = fadeout_ms * musicVolume / VVV_MAX_VOLUME;
-    fade.start_volume = musicVolume;
+    fade.duration_ms = fadeout_ms * controlVolume / VVV_MAX_VOLUME;
+    fade.start_volume = controlVolume;
     fade.end_volume = 0;
 }
 
@@ -1143,7 +1143,7 @@ void musicclass::fadeout(const bool quick_fade_ /*= true*/)
 
 void musicclass::processmusicfadein(void)
 {
-    enum FadeCode fade_code = processmusicfade(&fade, &musicVolume);
+    enum FadeCode fade_code = processmusicfade(&fade, &controlVolume);
     if (fade_code == Fade_finished)
     {
         m_doFadeInVol = false;
@@ -1152,10 +1152,10 @@ void musicclass::processmusicfadein(void)
 
 void musicclass::processmusicfadeout(void)
 {
-    enum FadeCode fade_code = processmusicfade(&fade, &musicVolume);
+    enum FadeCode fade_code = processmusicfade(&fade, &controlVolume);
     if (fade_code == Fade_finished)
     {
-        musicVolume = 0;
+        controlVolume = 0;
         m_doFadeOutVol = false;
         haltdasmusik(true);
     }
@@ -1322,7 +1322,7 @@ void musicclass::updatemutestate(void)
         }
         else
         {
-            set_music_volume(musicVolume);
+            set_music_volume(controlVolume);
         }
     }
 }
diff --git a/desktop_version/src/Music.h b/desktop_version/src/Music.h
index fcfad927..5e994977 100644
--- a/desktop_version/src/Music.h
+++ b/desktop_version/src/Music.h
@@ -108,7 +108,7 @@ public:
 
     bool m_doFadeInVol;
     bool m_doFadeOutVol;
-    int musicVolume;
+    int controlVolume;
 
     /* 0..USER_VOLUME_MAX */
     int user_music_volume;