From ad7c7d019ce039b9e9893ec94260f83edb581e6f Mon Sep 17 00:00:00 2001 From: "SND\\shalma_cp" Date: Sun, 30 Jan 2011 21:54:54 +0000 Subject: 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 --- libpcsxcore/cdrom.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'libpcsxcore') 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(); -- cgit v1.2.3