Commited patch in issue #8171 (by darktjm).

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@64524 e17a0e51-4ae3-4d35-97c3-1a29b211df97

1 files changed, 21 insertions, 23 deletions

diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c
index f263cb8f..36e916a1 100644
--- a/plugins/dfsound/spu.c
+++ b/plugins/dfsound/spu.c
@@ -23,22 +23,13 @@
 #include "cfg.h"
 #include "dsoundoss.h"
 #include "regs.h"
+#include "spu.h"
 
 #ifdef _WINDOWS
 #include "debug.h"
 #include "record.h"
 #endif
 
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#include <locale.h>
-#define _(x)  gettext(x)
-#define N_(x) (x)
-#else
-#define _(x)  (x)
-#define N_(x) (x)
-#endif
-
 #if defined (_WINDOWS)
 static char * libraryName     = N_("DirectSound Driver");
 #elif defined (USEMACOSX)
@@ -54,8 +45,9 @@ static char * libraryName     = N_("PulseAudio Sound");
 #else
 static char * libraryName     = N_("NULL Sound");
 #endif
-
+#if 0
 static char * libraryInfo     = N_("P.E.Op.S. Sound Driver V1.7\nCoded by Pete Bernert and the P.E.Op.S. team\n");
+#endif
 
 // globals
 
@@ -183,7 +175,7 @@ static int iSecureStart=0; // secure start counter
 //
 
 
-INLINE void InterpolateUp(int ch)
+static INLINE void InterpolateUp(int ch)
 {
  if(s_chan[ch].SB[32]==1)                              // flag == 1? calc step and set flag... and don't change the value in this pass
   {
@@ -231,7 +223,7 @@ INLINE void InterpolateUp(int ch)
 // even easier interpolation on downsampling, also no special filter, again just "Pete's common sense" tm
 //
 
-INLINE void InterpolateDown(int ch)
+static INLINE void InterpolateDown(int ch)
 {
  if(s_chan[ch].sinc>=0x20000L)                                 // we would skip at least one val?
   {
@@ -257,7 +249,7 @@ INLINE void InterpolateDown(int ch)
 // START SOUND... called by main thread to setup a new sound on a channel
 ////////////////////////////////////////////////////////////////////////
 
-INLINE void StartSound(int ch)
+static INLINE void StartSound(int ch)
 {
  StartADSR(ch);
  StartREVERB(ch);
@@ -287,7 +279,7 @@ INLINE void StartSound(int ch)
 // ALL KIND OF HELPERS
 ////////////////////////////////////////////////////////////////////////
 
-INLINE void VoiceChangeFrequency(int ch)
+static INLINE void VoiceChangeFrequency(int ch)
 {
  s_chan[ch].iUsedFreq=s_chan[ch].iActFreq;             // -> take it and calc steps
  s_chan[ch].sinc=s_chan[ch].iRawPitch<<4;
@@ -297,7 +289,7 @@ INLINE void VoiceChangeFrequency(int ch)
 
 ////////////////////////////////////////////////////////////////////////
 
-INLINE void FModChangeFrequency(int ch,int ns)
+static INLINE void FModChangeFrequency(int ch,int ns)
 {
  int NP=s_chan[ch].iRawPitch;
 
@@ -361,7 +353,7 @@ unsigned short NoiseFreqAdd[5] = {
 	0, 84, 140, 180, 210
 };
 
-INLINE void NoiseClock()
+static INLINE void NoiseClock()
 {
 	unsigned int level;
 
@@ -387,7 +379,7 @@ INLINE void NoiseClock()
 	}
 }
 
-INLINE int iGetNoiseVal(int ch)
+static INLINE int iGetNoiseVal(int ch)
 {
  int fa;
 
@@ -408,7 +400,7 @@ INLINE int iGetNoiseVal(int ch)
 
 ////////////////////////////////////////////////////////////////////////
 
-INLINE void StoreInterpolationVal(int ch,int fa)
+static INLINE void StoreInterpolationVal(int ch,int fa)
 {
 	/*
 	// fmod channel = sound output
@@ -446,7 +438,7 @@ INLINE void StoreInterpolationVal(int ch,int fa)
 
 ////////////////////////////////////////////////////////////////////////
 
-INLINE int iGetInterpolationVal(int ch)
+static INLINE int iGetInterpolationVal(int ch)
 {
  int fa;
 
@@ -1012,7 +1004,7 @@ DWORD WINAPI MAINThreadEx(LPVOID lpParameter)
 //  1 time every 'cycle' cycles... harhar
 
 long cpu_cycles;
-void CALLBACK SPUasync(unsigned long cycle)
+void CALLBACK SPUasync(uint32_t cycle)
 {
 	cpu_cycles += cycle;
 
@@ -1065,10 +1057,12 @@ void CALLBACK SPUasync(unsigned long cycle)
 // leave that func in the linux port, until epsxe linux is using
 // the async function as well
 
+#if 0
 void CALLBACK SPUupdate(void)
 {
  SPUasync(0);
 }
+#endif
 
 // XA AUDIO
 
@@ -1158,7 +1152,7 @@ void RemoveTimer(void)
 }
 
 // SETUPSTREAMS: init most of the spu buffers
-void SetupStreams(void)
+static void SetupStreams(void)
 { 
  int i;
 
@@ -1201,7 +1195,7 @@ void SetupStreams(void)
 }
 
 // REMOVESTREAMS: free most buffer
-void RemoveStreams(void)
+static void RemoveStreams(void)
 { 
  free(pSpuBuffer);                                     // free mixing buffer
  pSpuBuffer = NULL;
@@ -1355,10 +1349,12 @@ void CALLBACK SPUregisterCallback(void (CALLBACK *callback)(void))
  irqCallback = callback;
 }
 
+#if 0
 void CALLBACK SPUregisterCDDAVolume(void (CALLBACK *CDDAVcallback)(unsigned short,unsigned short))
 {
  cddavCallback = CDDAVcallback;
 }
+#endif
 
 // COMMON PLUGIN INFO FUNCS
 char * CALLBACK PSEgetLibName(void)
@@ -1376,7 +1372,9 @@ unsigned long CALLBACK PSEgetLibVersion(void)
  return (1 << 16) | (1 << 8);
 }
 
+#if 0
 char * SPUgetLibInfos(void)
 {
  return _(libraryInfo);
 }
+#endif