From eb2033f9b0f8aa4008b672b0843628c76482739b Mon Sep 17 00:00:00 2001 From: Agent X <44549182+AgentXLP@users.noreply.github.com> Date: Wed, 12 Jun 2024 14:43:29 -0400 Subject: [PATCH] Fix and improve custom audio stream volume code --- src/pc/lua/utils/smlua_audio_utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pc/lua/utils/smlua_audio_utils.c b/src/pc/lua/utils/smlua_audio_utils.c index 95d7ee1f..f16e360d 100644 --- a/src/pc/lua/utils/smlua_audio_utils.c +++ b/src/pc/lua/utils/smlua_audio_utils.c @@ -367,7 +367,7 @@ f32 audio_stream_get_volume(struct ModAudio* audio) { if (!audio_sanity_check(audio, true, "getvol")) { return 0; } - return ma_sound_get_volume(&audio->sound); + return audio->baseVolume; } void audio_stream_set_volume(struct ModAudio* audio, f32 volume) { @@ -377,6 +377,7 @@ void audio_stream_set_volume(struct ModAudio* audio, f32 volume) { f32 masterVolume = (f32)configMasterVolume / 127.0f; f32 musicVolume = (f32)configMusicVolume / 127.0f; ma_sound_set_volume(&audio->sound, masterVolume * musicVolume * volume); + audio->baseVolume = volume; } // void audio_stream_set_speed(struct ModAudio* audio, f32 initial_freq, f32 speed, bool pitch) {