From: notaz <notasas@gmail.com>
Date: Mon, 19 Jan 2026 01:59:58 +0000 (+0200)
Subject: cdrom: remove some old read-as-play logic
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6637a60f2bda99c858f6f0bd214cec93d98a9a42;p=pcsx_rearmed.git

cdrom: remove some old read-as-play logic

Supposedly tested in 2013 (55b8460a0e10da33133a98faeeb5b2375ef91dc0) but
maybe it was reading, not playing? Or maybe the mod chip affected this.

libretro/pcsx_rearmed#904
---

diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index 9aa3693c..a23e6ca1 100644
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -865,7 +865,6 @@ void cdrInterrupt(void) {
 			}
 			break;
 
-		do_CdlPlay:
 		case CdlPlay:
 			StopCdda();
 			StopReading();
@@ -1277,10 +1276,7 @@ void cdrInterrupt(void) {
 
 			Find_CurTrack(cdr.SetlocPending ? cdr.SetSector : cdr.SetSectorPlay);
 
-			if (cdr.Mode & MODE_CDDA)
-				// Read* acts as play for cdda tracks in cdda mode
-				goto do_CdlPlay;
-			if (cdr_stat.Type != CDRT_DATA) {
+			if (cdr_stat.Type != CDRT_DATA && !(cdr.Mode & MODE_CDDA)) {
 				error = ERROR_INVALIDCMD;
 				goto set_error;
 			}