From 71402b041845d0300c7c8de55770225614ec8e97 Mon Sep 17 00:00:00 2001 From: "SND\\edgbla_cp" Date: Sun, 17 Apr 2011 21:16:25 +0000 Subject: git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@65930 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- plugins/dfsound/externals.c | 2 +- plugins/dfsound/externals.h | 2 +- plugins/dfsound/xa.c | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'plugins') diff --git a/plugins/dfsound/externals.c b/plugins/dfsound/externals.c index 12fde65d..a7370010 100644 --- a/plugins/dfsound/externals.c +++ b/plugins/dfsound/externals.c @@ -18,7 +18,7 @@ #include // 15-bit value + 1-sign -int CLAMP16(x) { +int CLAMP16(int x) { if(x > 32767) x = 32767; else if(x < -32768) x = -32768; diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h index 8e570933..da3d9f65 100644 --- a/plugins/dfsound/externals.h +++ b/plugins/dfsound/externals.h @@ -34,7 +34,7 @@ // 15-bit value + 1-sign -extern int CLAMP16(x); +extern int CLAMP16(int x); //////////////////////////////////////////////////////////////////////// diff --git a/plugins/dfsound/xa.c b/plugins/dfsound/xa.c index 4d46be66..080caa71 100644 --- a/plugins/dfsound/xa.c +++ b/plugins/dfsound/xa.c @@ -87,11 +87,11 @@ INLINE void MixXA(void) lastxa_lc = lc; lastxa_rc = rc; - +/* // Tales of Phantasia - voice meter spuMem[ (decoded_xa + 0x000)/2 ] = (short) lc; spuMem[ (decoded_xa + 0x400)/2 ] = (short) rc; - +*/ decoded_xa += 2; if( decoded_xa >= 0x400 ) decoded_xa = 0; @@ -124,11 +124,11 @@ INLINE void MixXA(void) lc = lastxa_lc; rc = lastxa_rc; - +/* // Tales of Phantasia - voice meter spuMem[ (decoded_xa + 0x000)/2 ] = (short) lc; spuMem[ (decoded_xa + 0x400)/2 ] = (short) rc; - +*/ decoded_xa += 2; if( decoded_xa >= 0x400 ) decoded_xa = 0; @@ -170,11 +170,11 @@ INLINE void MixXA(void) lastcd_lc = lc; lastcd_rc = rc; - +/* // Vib Ribbon - playback spuMem[ (decoded_cdda + 0x000)/2 ] = (short) lc; spuMem[ (decoded_cdda + 0x400)/2 ] = (short) rc; - +*/ decoded_cdda += 2; if( decoded_cdda >= 0x400 ) decoded_cdda = 0; @@ -209,11 +209,11 @@ INLINE void MixXA(void) lc = lastcd_lc; rc = lastcd_rc; - +/* // Vib Ribbon - playback spuMem[ (decoded_cdda + 0x000)/2 ] = (short) lc; spuMem[ (decoded_cdda + 0x400)/2 ] = (short) rc; - +*/ decoded_cdda += 2; if( decoded_cdda >= 0x400 ) decoded_cdda = 0; -- cgit v1.2.3