From aebae692c118a897c780d6103011859371d63396 Mon Sep 17 00:00:00 2001 From: NovaSquirrel Date: Wed, 10 Nov 2021 18:36:51 -0500 Subject: [PATCH] Revert "Merge pull request #43 from Gumball2415/feature-add-2a03-interference" This reverts commit ba186e19568a1780c1f8f4d45776bb5a2444f4fc, reversing changes made to f1696a90be8be8506027a84df110fe648c2421b0. --- Core/Console.cpp | 4 ++-- Core/SoundMixer.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Core/Console.cpp b/Core/Console.cpp index fb6a1c4e..8d1cbc6f 100644 --- a/Core/Console.cpp +++ b/Core/Console.cpp @@ -473,10 +473,10 @@ void Console::ProcessCpuClock() void Console::ProcessInterferenceAudio() { - _InvA13 = (_ppu->_A13pinLow == 1) ? 0 : 1; // invert relative to 2A03 + _InvA13 = _ppu->_A13pinLow; _controlManager->GetInvOE1(_controlManager->_address); - _InvOE1 = (_controlManager->_OE1pinLow == 1) ? 0 : 1; // invert relative to 2A03 + _InvOE1 = _controlManager->_OE1pinLow; if (_controlManager->_strobed == true) _controlManager->_strobed = false; diff --git a/Core/SoundMixer.cpp b/Core/SoundMixer.cpp index 7446f193..be8c9b17 100644 --- a/Core/SoundMixer.cpp +++ b/Core/SoundMixer.cpp @@ -277,8 +277,8 @@ int16_t SoundMixer::GetOutputVolume(bool forRightChannel) #endif GetChannelOutput(AudioChannel::EPSM_L, forRightChannel) * 4 + GetChannelOutput(AudioChannel::EPSM_R, forRightChannel) * 4 + - GetChannelOutput(AudioChannel::InvA13, forRightChannel) * 20 + - GetChannelOutput(AudioChannel::InvOE1, forRightChannel) * 1000 + GetChannelOutput(AudioChannel::InvA13, forRightChannel) * 500 + + GetChannelOutput(AudioChannel::InvOE1, forRightChannel) * 500 ); }