empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
This reverts commit ba186e1956, reversing
changes made to f1696a90be.
This commit is contained in:
NovaSquirrel 2021-11-10 18:36:51 -05:00
parent bb9d052955
commit aebae692c1
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Core/Console.cpp
View file

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

4
Core/SoundMixer.cpp
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) * 20 + GetChannelOutput(AudioChannel::InvA13, forRightChannel) * 500 +
GetChannelOutput(AudioChannel::InvOE1, forRightChannel) * 1000 GetChannelOutput(AudioChannel::InvOE1, forRightChannel) * 500
); );
} }