summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/dfsound/externals.c2
-rw-r--r--plugins/dfsound/externals.h2
-rw-r--r--plugins/dfsound/xa.c16
3 files changed, 10 insertions, 10 deletions
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 <stdint.h>
// 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;