M src/gba/extra/audio-mixer.c → src/gba/extra/audio-mixer.c

@@ -237,6 +237,10 @@ track->track.patternStack[2] = memory->load32(cpu, base + offsetof(struct GBAMP2kMusicPlayerTrack, patternStack[2]), 0);
 		} else {
 			memset(&track->track, 0, sizeof(track->track));
 		}
+		if (track->track.runningStatus == 0xCD) {
+			// XCMD isn't supported
+			mixer->p->externalMixing = false;
+		}
 	}
 }
 
@@ -253,9 +257,6 @@ return true;
 }
 
 void _mp2kStep(struct GBAAudioMixer* mixer) {
-	if (!mixer->p->externalMixing) {
-		return;
-	}
 	mixer->frame += mixer->p->sampleInterval;
 
 	while (mixer->frame >= VIDEO_TOTAL_LENGTH / mixer->tempo) {
@@ -288,8 +289,10 @@ sample.left += value;
 			CircleBufferRead16(&mixer->activeTracks[track].buffer, &value);
 			sample.right += value;
 		}
-		blip_add_delta(mixer->p->psg.left, mixer->p->clock + i * interval, sample.left - mixer->last.left);
-		blip_add_delta(mixer->p->psg.right, mixer->p->clock + i * interval, sample.left - mixer->last.left);
+		if (mixer->p->externalMixing) {
+			blip_add_delta(mixer->p->psg.left, mixer->p->clock + i * interval, sample.left - mixer->last.left);
+			blip_add_delta(mixer->p->psg.right, mixer->p->clock + i * interval, sample.left - mixer->last.left);
+		}
 		mixer->last = sample;
 	}
 }