diff options
| author | Chris <f1ana@users.noreply.github.com> | 2026-09-28 23:27:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-09-29 03:27:11 +0000 |
| commit | b9bcc5e9015908df811401deb528aa5559fae3d9 (patch) | |
| tree | d8c8cc05fa67c0013ecef0dd6bd70e4b63aa2bd9 /soh/src/code | |
| parent | aa25eb4d5669446efd56e16497c186d69d646b71 (diff) | |
Fix audio thread race on CVar reads during preset apply (#7265)
Diffstat (limited to 'soh/src/code')
| -rw-r--r-- | soh/src/code/audio_playback.c | 5 | ||||
| -rw-r--r-- | soh/src/code/audio_synthesis.c | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/soh/src/code/audio_playback.c b/soh/src/code/audio_playback.c index ba250252c..cffe35e1c 100644 --- a/soh/src/code/audio_playback.c +++ b/soh/src/code/audio_playback.c @@ -1,5 +1,6 @@ #include "global.h" #include "soh/ResourceManagerHelpers.h" +#include "soh/Enhancements/audio/AudioSettings.h" extern bool gUseLegacySD; @@ -94,7 +95,7 @@ void Audio_InitNoteSub(Note* note, NoteSubEu* sub, NoteSubAttributes* attrs) { vel = 0.0f > vel ? 0.0f : vel; vel = 1.0f < vel ? 1.0f : vel; - float master_vol = (float)CVarGetInteger(CVAR_SETTING("Volume.Master"), 40) / 100.0f; + float master_vol = AudioSettings_GetMasterVolume(); sub->targetVolLeft = (s32)((vel * volLeft) * (0x1000 - 0.001f)) * master_vol; sub->targetVolRight = (s32)((vel * volRight) * (0x1000 - 0.001f)) * master_vol; @@ -120,7 +121,7 @@ void Audio_NoteSetResamplingRate(NoteSubEu* noteSubEu, f32 resamplingRateInput) } else { noteSubEu->bitField1.hasTwoParts = true; if (3.99996f < resamplingRateInput) { - if (CVarGetInteger(CVAR_AUDIO("ExperimentalOctaveDrop"), 0) || noteSubEu->bitField1.isSyntheticWave) { + if (AudioSettings_GetOctaveDrop() || noteSubEu->bitField1.isSyntheticWave) { resamplingRate = resamplingRateInput * 0.5f; while (resamplingRate > 1.99998f) { diff --git a/soh/src/code/audio_synthesis.c b/soh/src/code/audio_synthesis.c index 7b2db2267..4fed4e939 100644 --- a/soh/src/code/audio_synthesis.c +++ b/soh/src/code/audio_synthesis.c @@ -1,6 +1,7 @@ #include <libultraship/libultra.h> #include "global.h" #include "soh/mixer.h" +#include "soh/Enhancements/audio/AudioSettings.h" #define DEFAULT_LEN_1CH 0x1A0 #define DEFAULT_LEN_2CH 0x340 @@ -654,7 +655,7 @@ Acmd* AudioSynth_DoOneAudioUpdate(s16* aiBuf, s32 aiBufLen, Acmd* cmd, s32 updat } updateIndex = aiBufLen * 2; - if (CVarGetInteger(CVAR_ENHANCEMENT("MirroredWorld"), 0)) { + if (AudioSettings_GetMirroredWorld()) { aInterleave(cmd++, DMEM_TEMP, DMEM_RIGHT_CH, DMEM_LEFT_CH, updateIndex); } else { aInterleave(cmd++, DMEM_TEMP, DMEM_LEFT_CH, DMEM_RIGHT_CH, updateIndex); |