From 8e988d7c79d668bc602decd2e5e091717dd24a46 Mon Sep 17 00:00:00 2001 From: riggles1 Date: Wed, 29 Nov 2023 21:40:43 +0100 Subject: [PATCH] Update SoundMixer.cpp Tweaked volumes for audio channels. --- Core/SoundMixer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Core/SoundMixer.cpp b/Core/SoundMixer.cpp index 94dd9325..3f12baa3 100644 --- a/Core/SoundMixer.cpp +++ b/Core/SoundMixer.cpp @@ -228,7 +228,7 @@ double SoundMixer::GetChannelOutput(AudioChannel channel, bool forRightChannel) int16_t SoundMixer::GetOutputVolume(bool forRightChannel) { double squareOutput = GetChannelOutput(AudioChannel::Square1, forRightChannel) + GetChannelOutput(AudioChannel::Square2, forRightChannel); - double tndOutput = GetChannelOutput(AudioChannel::DMC, forRightChannel) + 2.7516713261 * GetChannelOutput(AudioChannel::Triangle, forRightChannel) + 1.8493587125 * GetChannelOutput(AudioChannel::Noise, forRightChannel); + double tndOutput = 1.0966713261 * GetChannelOutput(AudioChannel::DMC, forRightChannel) + 2.7516713261 * GetChannelOutput(AudioChannel::Triangle, forRightChannel) + 1.8493587125 * GetChannelOutput(AudioChannel::Noise, forRightChannel); uint16_t squareVolume = (uint16_t)((95.88*5000.0) / (8128.0 / squareOutput + 100.0)); uint16_t tndVolume = (uint16_t)((159.79*5000.0) / (22638.0 / tndOutput + 100.0)); @@ -238,7 +238,7 @@ int16_t SoundMixer::GetOutputVolume(bool forRightChannel) GetChannelOutput(AudioChannel::MMC5, forRightChannel) * 43 + GetChannelOutput(AudioChannel::Namco163, forRightChannel) * 20 + GetChannelOutput(AudioChannel::Sunsoft5B, forRightChannel) * 15 + - GetChannelOutput(AudioChannel::VRC6, forRightChannel) * 75 + + GetChannelOutput(AudioChannel::VRC6, forRightChannel) * 48 + GetChannelOutput(AudioChannel::VRC7, forRightChannel)); }