From e37741a04b4f2048e7af3f678937ffec978a3bbe Mon Sep 17 00:00:00 2001
From: "SND\\weimingzhi_cp"
 <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Sat, 22 Aug 2009 04:00:37 +0000
Subject: git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@27208
 e17a0e51-4ae3-4d35-97c3-1a29b211df97

---
 libpcsxcore/cdrom.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'libpcsxcore')

diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index c2361900..c3f0694c 100644
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -332,9 +332,9 @@ void cdrInterrupt() {
     	case CdlGetlocP:
 			SetResultSize(8);
 			subq = (struct SubQ *)CDR_getBufferSub();
-			if (subq != NULL) {
+			if (subq != NULL) {
 				cdr.Result[0] = subq->TrackNumber;
-				cdr.Result[1] = subq->IndexNumber;
+				cdr.Result[1] = subq->IndexNumber;
 		    	memcpy(cdr.Result + 2, subq->TrackRelativeAddress, 3);
 		    	memcpy(cdr.Result + 5, subq->AbsoluteAddress, 3);
 			} else {
@@ -604,7 +604,7 @@ void cdrReadInterrupt() {
 	fprintf(emuLog, "cdrReadInterrupt() Log: cdr.Transfer %x:%x:%x\n", cdr.Transfer[0], cdr.Transfer[1], cdr.Transfer[2]);
 #endif
 
-	if ((cdr.Muted == 1) && (cdr.Mode & 0x40) && (!Config.Xa) && (cdr.FirstSector != -1)) { // CD-XA
+	if (!cdr.Muted && (cdr.Mode & 0x40) && (!Config.Xa) && (cdr.FirstSector != -1)) { // CD-XA
 		if ((cdr.Transfer[4 + 2] & 0x4) &&
 			((cdr.Mode & 0x8) ? (cdr.Transfer[4 + 1] == cdr.Channel) : 1) &&
 			(cdr.Transfer[4 + 0] == cdr.File)) {
@@ -840,14 +840,14 @@ void cdrWrite1(unsigned char rt) {
         	break;
 
     	case CdlMute:
-        	cdr.Muted = 0;
+        	cdr.Muted = 1;
 			cdr.Ctrl |= 0x80;
     		cdr.Stat = NoIntr; 
     		AddIrqQueue(cdr.Cmd, 0x800);
         	break;
 
     	case CdlDemute:
-        	cdr.Muted = 1;
+        	cdr.Muted = 0;
 			cdr.Ctrl |= 0x80;
     		cdr.Stat = NoIntr; 
     		AddIrqQueue(cdr.Cmd, 0x800);
-- 
cgit v1.2.3