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

Audio: Fixed a number of issues with square channel - apu_mixer tests sound much closer to real hardware.

Browse source
This commit is contained in:
Souryo 2016-12-21 18:27:08 -05:00
parent 75e0de636e
commit bf36d39eb7
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Core/SquareChannel.h
View file

@ -8,10 +8,10 @@ class SquareChannel : public ApuEnvelope
{
private:
const vector<vector<uint8_t>> _dutySequences = { {
{ 0, 1, 0, 0, 0, 0, 0, 0 },
{ 0, 1, 1, 0, 0, 0, 0, 0 },
{ 0, 1, 1, 1, 1, 0, 0, 0 },
{ 1, 0, 0, 1, 1, 1, 1, 1 }
{ 0, 0, 0, 0, 0, 0, 0, 1 },
{ 0, 0, 0, 0, 0, 0, 1, 1 },
{ 0, 0, 0, 0, 1, 1, 1, 1 },
{ 1, 1, 1, 1, 1, 1, 0, 0 }
} };
bool _isChannel1 = false;
@ -70,16 +70,20 @@ private:
UpdateTargetPeriod();
}
protected:
void Clock() override
void UpdateOutput()
{
if(IsMuted()) {
AddOutput(0);
} else {
AddOutput(_dutySequences[_duty][_dutyPos] * GetVolume());
}
}
_dutyPos = (_dutyPos + 1) & 0x07;
protected:
void Clock() override
{
_dutyPos = (_dutyPos - 1) & 0x07;
UpdateOutput();
}
public:
@ -151,13 +155,14 @@ public:
SetPeriod((_realPeriod & 0xFF) | ((value & 0x07) << 8));
//The sequencer is restarted at the first value of the current sequence.
_timer = 0;
_dutyPos = 0;
//The envelope is also restarted.
ResetEnvelope();
break;
}
UpdateOutput();
}
void TickSweep()