diff options
| -rw-r--r-- | src/audio_core/audio_renderer.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/audio_core/audio_renderer.cpp b/src/audio_core/audio_renderer.cpp index fc6e70f6b..50846a854 100644 --- a/src/audio_core/audio_renderer.cpp +++ b/src/audio_core/audio_renderer.cpp | |||
| @@ -315,8 +315,8 @@ void AudioRenderer::VoiceState::RefreshBuffer(Core::Memory::Memory& memory, | |||
| 315 | sample *= voice_resources[0]->mix_volumes[0]; | 315 | sample *= voice_resources[0]->mix_volumes[0]; |
| 316 | } | 316 | } |
| 317 | 317 | ||
| 318 | samples[index * 2] = static_cast<s16>(sample); | 318 | samples[index * 2] = static_cast<s16>(sample * info.volume); |
| 319 | samples[index * 2 + 1] = static_cast<s16>(sample); | 319 | samples[index * 2 + 1] = static_cast<s16>(sample * info.volume); |
| 320 | } | 320 | } |
| 321 | break; | 321 | break; |
| 322 | } | 322 | } |
| @@ -336,11 +336,11 @@ void AudioRenderer::VoiceState::RefreshBuffer(Core::Memory::Memory& memory, | |||
| 336 | } | 336 | } |
| 337 | 337 | ||
| 338 | if (voice_resources[1]->in_use) { | 338 | if (voice_resources[1]->in_use) { |
| 339 | sample_l *= voice_resources[1]->mix_volumes[1]; | 339 | sample_r *= voice_resources[1]->mix_volumes[1]; |
| 340 | } | 340 | } |
| 341 | 341 | ||
| 342 | samples[index_l] = static_cast<s16>(sample_l); | 342 | samples[index_l] = static_cast<s16>(sample_l * info.volume); |
| 343 | samples[index_r] = static_cast<s16>(sample_r); | 343 | samples[index_r] = static_cast<s16>(sample_r * info.volume); |
| 344 | } | 344 | } |
| 345 | break; | 345 | break; |
| 346 | } | 346 | } |
| @@ -371,8 +371,10 @@ void AudioRenderer::VoiceState::RefreshBuffer(Core::Memory::Memory& memory, | |||
| 371 | BR *= voice_resources[5]->mix_volumes[5]; | 371 | BR *= voice_resources[5]->mix_volumes[5]; |
| 372 | } | 372 | } |
| 373 | 373 | ||
| 374 | samples[index * 2] = static_cast<s16>(0.3694f * FL + 0.2612f * FC + 0.3694f * BL); | 374 | samples[index * 2] = |
| 375 | samples[index * 2 + 1] = static_cast<s16>(0.3694f * FR + 0.2612f * FC + 0.3694f * BR); | 375 | static_cast<s16>((0.3694f * FL + 0.2612f * FC + 0.3694f * BL) * info.volume); |
| 376 | samples[index * 2 + 1] = | ||
| 377 | static_cast<s16>((0.3694f * FR + 0.2612f * FC + 0.3694f * BR) * info.volume); | ||
| 376 | } | 378 | } |
| 377 | break; | 379 | break; |
| 378 | } | 380 | } |