ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GB Audio: Update channels 1/2 irregularly if silent

This commit is contained in:
Vicki Pfau 2023-06-29 02:54:29 -07:00
parent c5a7b1a9b7
commit 2a974a74e7
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gb/audio.c
View File

@ -204,7 +204,6 @@ void GBAudioWriteNR14(struct GBAudio* audio, uint8_t value) {
--audio->ch1.control.length; --audio->ch1.control.length;
} }
} }
audio->ch1.lastUpdate = mTimingCurrentTime(audio->timing);
_updateSquareSample(&audio->ch1); _updateSquareSample(&audio->ch1);
} }
*audio->nr52 &= ~0x0001; *audio->nr52 &= ~0x0001;
@ -252,7 +251,6 @@ void GBAudioWriteNR24(struct GBAudio* audio, uint8_t value) {
--audio->ch2.control.length; --audio->ch2.control.length;
} }
} }
audio->ch2.lastUpdate = mTimingCurrentTime(audio->timing);
_updateSquareSample(&audio->ch2); _updateSquareSample(&audio->ch2);
} }
*audio->nr52 &= ~0x0002; *audio->nr52 &= ~0x0002;
@ -510,7 +508,7 @@ void GBAudioRun(struct GBAudio* audio, int32_t timestamp, int channels) {
GBAudioSample(audio, timestamp); GBAudioSample(audio, timestamp);
} }
if (audio->playingCh1 && (channels & 0x1) && audio->ch1.envelope.dead != 2) { if ((channels & 0x1) && ((audio->playingCh1 && audio->ch1.envelope.dead != 2) || timestamp - audio->ch1.lastUpdate > 0x40000000)) {
int period = 4 * (2048 - audio->ch1.control.frequency) * audio->timingFactor; int period = 4 * (2048 - audio->ch1.control.frequency) * audio->timingFactor;
int32_t diff = timestamp - audio->ch1.lastUpdate; int32_t diff = timestamp - audio->ch1.lastUpdate;
if (diff >= period) { if (diff >= period) {
@ -520,7 +518,7 @@ void GBAudioRun(struct GBAudio* audio, int32_t timestamp, int channels) {
_updateSquareSample(&audio->ch1); _updateSquareSample(&audio->ch1);
} }
} }
if (audio->playingCh2 && (channels & 0x2) && audio->ch2.envelope.dead != 2) { if ((channels & 0x2) && ((audio->playingCh2 && audio->ch2.envelope.dead != 2) || timestamp - audio->ch2.lastUpdate > 0x40000000)) {
int period = 4 * (2048 - audio->ch2.control.frequency) * audio->timingFactor; int period = 4 * (2048 - audio->ch2.control.frequency) * audio->timingFactor;
int32_t diff = timestamp - audio->ch2.lastUpdate; int32_t diff = timestamp - audio->ch2.lastUpdate;
if (diff >= period) { if (diff >= period) {