diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2009-08-22 04:00:37 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2009-08-22 04:00:37 +0000 |
| commit | e37741a04b4f2048e7af3f678937ffec978a3bbe (patch) | |
| tree | fd2a49f4c640c08af816bd4524482c273e785c72 | |
| parent | 3c354e92265d79bb0383bbe88a67139b4ab33dc7 (diff) | |
| download | pcsxr-e37741a04b4f2048e7af3f678937ffec978a3bbe.tar.gz | |
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@27208 e17a0e51-4ae3-4d35-97c3-1a29b211df97
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | debian/rules | 1 | ||||
| -rw-r--r-- | libpcsxcore/cdrom.c | 10 |
3 files changed, 10 insertions, 6 deletions
@@ -1,6 +1,11 @@ +August 22, 2009 dario86 + + * libpcsxcore/cdrom.c: Demute the CD-DA by default. + August 22, 2009 Wei Mingzhi <weimingzhi@gmail.com> * libpcsxcore/misc.c: Also check for PSX.EXE in CheckCdrom(). + * debian/rules: Removed dh_desktop. August 17, 2009 Wei Mingzhi <weimingzhi@gmail.com> diff --git a/debian/rules b/debian/rules index 7ab3f0ee..5744fb15 100755 --- a/debian/rules +++ b/debian/rules @@ -60,7 +60,6 @@ binary-arch: build install dh_installchangelogs ChangeLog dh_installdocs dh_installmenu - dh_desktop dh_link dh_strip dh_compress 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); |