diff options
| author | SND\shalma_cp <SND\shalma_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-01-30 21:54:54 +0000 |
|---|---|---|
| committer | SND\shalma_cp <SND\shalma_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-01-30 21:54:54 +0000 |
| commit | ad7c7d019ce039b9e9893ec94260f83edb581e6f (patch) | |
| tree | 6a767d208ac51c387a1975847e2b64c52f0b69ec | |
| parent | 39481b5db7eb8925e78de91f72983000e36ce485 (diff) | |
| download | pcsxr-ad7c7d019ce039b9e9893ec94260f83edb581e6f.tar.gz | |
cdrom.c
- mute data track 01
- fix cdlplay resume
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@62711 e17a0e51-4ae3-4d35-97c3-1a29b211df97
| -rw-r--r-- | libpcsxcore/cdrom.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c index 3b846baa..e0abf159 100644 --- a/libpcsxcore/cdrom.c +++ b/libpcsxcore/cdrom.c @@ -875,10 +875,10 @@ void cdrPlayInterrupt() - // TODO: mute data track cdplay
-
- // mute
- if (Config.Cdda) memset( cdr.Transfer, 0, CD_FRAMESIZE_RAW );
+ // mute data track
+ if( (Config.Cdda) ||
+ (CDR_getStatus(&stat) != -1 && stat.Type == 1 && cdr.CurTrack == 1) )
+ memset( cdr.Transfer, 0, CD_FRAMESIZE_RAW );
if( cdr.Play && SPU_playCDDAchannel)
@@ -1872,14 +1872,8 @@ void cdrWrite1(unsigned char rt) { /* GameShark CD Player: save time for resume - Twisted Metal - World Tour: don't save times for DATA reads - - Only get 1 chance to do this right + Twisted Metal - World Tour: don't mix Setloc / CdlPlay cursors
*/ - if( cdr.Play && CDR_getStatus(&stat) != -1 ) { - cdr.SetSectorPlay[0] = stat.Time[0]; - cdr.SetSectorPlay[1] = stat.Time[1]; - cdr.SetSectorPlay[2] = stat.Time[2]; - } StopCdda(); StopReading(); |