diff options
| -rw-r--r-- | libpcsxcore/cdriso.c | 4 | ||||
| -rw-r--r-- | plugins/dfsound/alsa.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c index 170950eb..eb7bbe3b 100644 --- a/libpcsxcore/cdriso.c +++ b/libpcsxcore/cdriso.c @@ -37,8 +37,6 @@ #define SUB_FRAMESIZE 96 -#define CDDA_FRAMETIME (1000 * (sizeof(sndbuffer) / CD_FRAMESIZE_RAW) / 75) - FILE *cdHandle = NULL; FILE *cddaHandle = NULL; FILE *subHandle = NULL; @@ -48,6 +46,8 @@ static unsigned char subbuffer[SUB_FRAMESIZE]; static unsigned char sndbuffer[CD_FRAMESIZE_RAW * 10]; +#define CDDA_FRAMETIME (1000 * (sizeof(sndbuffer) / CD_FRAMESIZE_RAW) / 75) + #ifdef _WIN32 static HANDLE threadid; #else diff --git a/plugins/dfsound/alsa.c b/plugins/dfsound/alsa.c index 3aadc588..2a291f6a 100644 --- a/plugins/dfsound/alsa.c +++ b/plugins/dfsound/alsa.c @@ -251,7 +251,7 @@ void SoundFeedStreamData(unsigned char* pSound,long lBytes) // PLAY CDDA CHANNEL void CALLBACK SPUplayCDDAchannel(short* pcm, int nbytes) { - if (handle_cdda == NULL) SetupCDDASound(); + if (handle_cdda == NULL) return; if (snd_pcm_state(handle_cdda) == SND_PCM_STATE_XRUN) snd_pcm_prepare(handle_cdda); |