Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix and improve custom audio stream volume code

This commit is contained in:
Agent X 2024-06-12 14:43:29 -04:00
parent 04964b7569
commit eb2033f9b0
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pc/lua/utils/smlua_audio_utils.c
View File

@ -367,7 +367,7 @@ f32 audio_stream_get_volume(struct ModAudio* audio) {
if (!audio_sanity_check(audio, true, "getvol")) { if (!audio_sanity_check(audio, true, "getvol")) {
return 0; return 0;
} }
return ma_sound_get_volume(&audio->sound); return audio->baseVolume;
} }
void audio_stream_set_volume(struct ModAudio* audio, f32 volume) { 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 masterVolume = (f32)configMasterVolume / 127.0f;
f32 musicVolume = (f32)configMusicVolume / 127.0f; f32 musicVolume = (f32)configMusicVolume / 127.0f;
ma_sound_set_volume(&audio->sound, masterVolume * musicVolume * volume); 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) { // void audio_stream_set_speed(struct ModAudio* audio, f32 initial_freq, f32 speed, bool pitch) {