Merge pull request #43 from Gumball2415/feature-add-2a03-interference

Audio interference hotfix
This commit is contained in:
NovaSquirrel 2021-08-14 10:44:46 -04:00 committed by GitHub
commit ba186e1956
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View file

@ -473,10 +473,10 @@ void Console::ProcessCpuClock()
void Console::ProcessInterferenceAudio() void Console::ProcessInterferenceAudio()
{ {
_InvA13 = _ppu->_A13pinLow; _InvA13 = (_ppu->_A13pinLow == 1) ? 0 : 1; // invert relative to 2A03
_controlManager->GetInvOE1(_controlManager->_address); _controlManager->GetInvOE1(_controlManager->_address);
_InvOE1 = _controlManager->_OE1pinLow; _InvOE1 = (_controlManager->_OE1pinLow == 1) ? 0 : 1; // invert relative to 2A03
if (_controlManager->_strobed == true) if (_controlManager->_strobed == true)
_controlManager->_strobed = false; _controlManager->_strobed = false;

View file

@ -277,8 +277,8 @@ int16_t SoundMixer::GetOutputVolume(bool forRightChannel)
#endif #endif
GetChannelOutput(AudioChannel::EPSM_L, forRightChannel) * 4 + GetChannelOutput(AudioChannel::EPSM_L, forRightChannel) * 4 +
GetChannelOutput(AudioChannel::EPSM_R, forRightChannel) * 4 + GetChannelOutput(AudioChannel::EPSM_R, forRightChannel) * 4 +
GetChannelOutput(AudioChannel::InvA13, forRightChannel) * 500 + GetChannelOutput(AudioChannel::InvA13, forRightChannel) * 20 +
GetChannelOutput(AudioChannel::InvOE1, forRightChannel) * 500 GetChannelOutput(AudioChannel::InvOE1, forRightChannel) * 1000
); );
} }