From 420683a80f4de21a4d4885e1053e65c692b46080 Mon Sep 17 00:00:00 2001
From: mothbeanie <shinywolf07ontheinternets@gmail.com>
Date: Sat, 14 Dec 2024 16:49:47 -0800
Subject: [PATCH] introduce functions to modulate user volume

---
 desktop_version/src/Music.cpp | 24 +++++++++++++++++-------
 desktop_version/src/Music.h   |  3 +++
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/desktop_version/src/Music.cpp b/desktop_version/src/Music.cpp
index 4da6f695..7e172b7a 100644
--- a/desktop_version/src/Music.cpp
+++ b/desktop_version/src/Music.cpp
@@ -909,6 +909,16 @@ void musicclass::destroy(void)
     VVV_freefunc(FAudio_Release, faudioctx);
 }
 
+void musicclass::set_music_volume(int volume)
+{
+    MusicTrack::SetVolume(volume * user_music_volume / USER_VOLUME_MAX);
+}
+
+void musicclass::set_sound_volume(int volume)
+{
+    SoundTrack::SetVolume(volume * user_sound_volume / USER_VOLUME_MAX);
+}
+
 void musicclass::play(int t)
 {
     if (mmmmmm && usingmmmmmm)
@@ -962,7 +972,7 @@ void musicclass::play(int t)
             m_doFadeInVol = false;
             m_doFadeOutVol = false;
             musicVolume = VVV_MAX_VOLUME;
-            MusicTrack::SetVolume(VVV_MAX_VOLUME * user_music_volume / USER_VOLUME_MAX);
+            set_music_volume(musicVolume);
         }
     }
     else
@@ -1100,7 +1110,7 @@ void musicclass::fadeMusicVolumeIn(int ms)
     musicVolume = 0;
 
     /* Fix 1-frame glitch */
-    MusicTrack::SetVolume(0);
+    set_music_volume(0);
 
     fade.step_ms = 0;
     fade.duration_ms = ms;
@@ -1299,20 +1309,20 @@ void musicclass::updatemutestate(void)
 {
     if (game.muted)
     {
-        MusicTrack::SetVolume(0);
-        SoundTrack::SetVolume(0);
+        set_music_volume(0);
+        set_sound_volume(0);
     }
     else
     {
-        SoundTrack::SetVolume(VVV_MAX_VOLUME * user_sound_volume / USER_VOLUME_MAX);
+        set_sound_volume(VVV_MAX_VOLUME);
 
         if (game.musicmuted)
         {
-            MusicTrack::SetVolume(0);
+            set_music_volume(0);
         }
         else
         {
-            MusicTrack::SetVolume(musicVolume * user_music_volume / USER_VOLUME_MAX);
+            set_music_volume(musicVolume);
         }
     }
 }
diff --git a/desktop_version/src/Music.h b/desktop_version/src/Music.h
index 4085fb0b..fcfad927 100644
--- a/desktop_version/src/Music.h
+++ b/desktop_version/src/Music.h
@@ -70,6 +70,9 @@ public:
     void init(void);
     void destroy(void);
 
+    void set_music_volume(int volume);
+    void set_sound_volume(int volume);
+
     void play(int t);
     void resume(void);
     void resumefade(const int fadein_ms);