thirdpartymirrors/UnleashedRecomp
1
0
Fork 0
mirror of https://github.com/hedge-dev/UnleashedRecomp.git synced 2025-12-20 06:52:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Apply master volume in audio backend. (#202)

Browse source
This commit is contained in:
Skyth (Asilkan) 2025-01-26 13:54:08 +03:00 • committed by GitHub
parent 76ec5f032d
commit 0d4b66fe98
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
UnleashedRecomp/apu/driver/sdl2_driver.cpp
View file

@ -94,6 +94,8 @@ void XAudioRegisterClient(PPCFunc* callback, uint32_t param)
void XAudioSubmitFrame(void* samples) void XAudioSubmitFrame(void* samples)
{ {
auto floatSamples = reinterpret_cast<be<float>*>(samples);
if (g_downMixToStereo) if (g_downMixToStereo)
{ {
// 0: left 1.0f, right 0.0f // 0: left 1.0f, right 0.0f
@ -103,8 +105,6 @@ void XAudioSubmitFrame(void* samples)
// 4: left 1.0f, right 0.0f // 4: left 1.0f, right 0.0f
// 5: left 0.0f, right 1.0f // 5: left 0.0f, right 1.0f
auto floatSamples = reinterpret_cast<be<float>*>(samples);
std::array<float, 2 * XAUDIO_NUM_SAMPLES> audioFrames; std::array<float, 2 * XAUDIO_NUM_SAMPLES> audioFrames;
for (size_t i = 0; i < XAUDIO_NUM_SAMPLES; i++) for (size_t i = 0; i < XAUDIO_NUM_SAMPLES; i++)
@ -116,22 +116,20 @@ void XAudioSubmitFrame(void* samples)
float ch4 = floatSamples[4 * XAUDIO_NUM_SAMPLES + i]; float ch4 = floatSamples[4 * XAUDIO_NUM_SAMPLES + i];
float ch5 = floatSamples[5 * XAUDIO_NUM_SAMPLES + i]; float ch5 = floatSamples[5 * XAUDIO_NUM_SAMPLES + i];
audioFrames[i * 2 + 0] = ch0 + ch2 * 0.75f + ch4; audioFrames[i * 2 + 0] = (ch0 + ch2 * 0.75f + ch4) * Config::MasterVolume;
audioFrames[i * 2 + 1] = ch1 + ch2 * 0.75f + ch5; audioFrames[i * 2 + 1] = (ch1 + ch2 * 0.75f + ch5) * Config::MasterVolume;
} }
SDL_QueueAudio(g_audioDevice, &audioFrames, sizeof(audioFrames)); SDL_QueueAudio(g_audioDevice, &audioFrames, sizeof(audioFrames));
} }
else else
{ {
auto rawSamples = reinterpret_cast<be<uint32_t>*>(samples); std::array<float, XAUDIO_NUM_CHANNELS * XAUDIO_NUM_SAMPLES> audioFrames;
std::array<uint32_t, XAUDIO_NUM_CHANNELS * XAUDIO_NUM_SAMPLES> audioFrames;
for (size_t i = 0; i < XAUDIO_NUM_SAMPLES; i++) for (size_t i = 0; i < XAUDIO_NUM_SAMPLES; i++)
{ {
for (size_t j = 0; j < XAUDIO_NUM_CHANNELS; j++) for (size_t j = 0; j < XAUDIO_NUM_CHANNELS; j++)
audioFrames[i * XAUDIO_NUM_CHANNELS + j] = rawSamples[j * XAUDIO_NUM_SAMPLES + i]; audioFrames[i * XAUDIO_NUM_CHANNELS + j] = floatSamples[j * XAUDIO_NUM_SAMPLES + i] * Config::MasterVolume;
} }
SDL_QueueAudio(g_audioDevice, &audioFrames, sizeof(audioFrames)); SDL_QueueAudio(g_audioDevice, &audioFrames, sizeof(audioFrames));

6
UnleashedRecomp/patches/audio_patches.cpp
View file

@ -52,15 +52,15 @@ void AudioPatches::Update(float deltaTime)
} }
else else
{ {
*pMusicVolume = std::lerp(*pMusicVolume, Config::MusicVolume * Config::MasterVolume, time); *pMusicVolume = std::lerp(*pMusicVolume, Config::MusicVolume, time);
} }
} }
else else
{ {
*pMusicVolume = Config::MusicVolume * Config::MasterVolume; *pMusicVolume = Config::MusicVolume;
} }
*pEffectsVolume = Config::EffectsVolume * Config::MasterVolume; *pEffectsVolume = Config::EffectsVolume;
} }
// Stub volume setter. // Stub volume setter.