Patch 10804, 10805 (MaddTheSane).

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

7 files changed, 25 insertions, 18 deletions

diff --git a/plugins/dfsound/adsr.h b/plugins/dfsound/adsr.h
index a99fc90c..47f38abd 100644
--- a/plugins/dfsound/adsr.h
+++ b/plugins/dfsound/adsr.h
@@ -15,5 +15,5 @@
  *                                                                         *

  ***************************************************************************/

 

-void StartADSR(int ch);

-int  MixADSR(int ch);

+extern void StartADSR(int ch);

+extern int  MixADSR(int ch);

diff --git a/plugins/dfsound/reverb.c b/plugins/dfsound/reverb.c
index bd20f3e5..e0746006 100644
--- a/plugins/dfsound/reverb.c
+++ b/plugins/dfsound/reverb.c
@@ -84,7 +84,7 @@ void StartREVERB(int ch)
 // HELPER FOR NEILL'S REVERB: re-inits our reverb mixing buf

 ////////////////////////////////////////////////////////////////////////

 

-static INLINE void InitREVERB(void)

+void InitREVERB(void)

 {

  if(iUseReverb==2)

   {memset(sRVBStart,0,NSSIZE*2*4);}

@@ -94,7 +94,7 @@ static INLINE void InitREVERB(void)
 // STORE REVERB

 ////////////////////////////////////////////////////////////////////////

 

-static INLINE void StoreREVERB_CD(int left, int right,int ns)

+void StoreREVERB_CD(int left, int right,int ns)

 {

  if(iUseReverb==0) return;

  else

@@ -184,7 +184,7 @@ static INLINE void s_buffer1(int iOff,int iVal)                // set_buffer (+1
 

 ////////////////////////////////////////////////////////////////////////

 

-static INLINE int MixREVERBLeft(int ns)

+int MixREVERBLeft(int ns)

 {

  if(iUseReverb==0) return 0;

  else

@@ -291,7 +291,7 @@ static INLINE int MixREVERBLeft(int ns)
 

 ////////////////////////////////////////////////////////////////////////

 

-static INLINE int MixREVERBRight(void)

+int MixREVERBRight(void)

 {

  if(iUseReverb==0) return 0;

  else

diff --git a/plugins/dfsound/reverb.h b/plugins/dfsound/reverb.h
index ea0a1a2d..3a5cb9b3 100644
--- a/plugins/dfsound/reverb.h
+++ b/plugins/dfsound/reverb.h
@@ -15,7 +15,10 @@
  *                                                                         *

  ***************************************************************************/

 

-void SetREVERB(unsigned short val);

-void StartREVERB(int ch);

-void StoreREVERB(int ch,int ns);

-

+extern void SetREVERB(unsigned short val);

+extern void InitREVERB(void);

+extern void StartREVERB(int ch);

+extern void StoreREVERB(int ch,int ns);

+extern void StoreREVERB_CD(int left, int right,int ns);

+extern int  MixREVERBLeft(int ns);

+extern int  MixREVERBRight(void);

diff --git a/plugins/dfsound/xa.h b/plugins/dfsound/xa.h
index 90b89f41..06ff990c 100644
--- a/plugins/dfsound/xa.h
+++ b/plugins/dfsound/xa.h
@@ -15,6 +15,6 @@
  *                                                                         *

  ***************************************************************************/

 

-void MixXA(void);

-void FeedXA(xa_decode_t *xap);

-void FeedCDDA(unsigned char *pcm, int nBytes);

+extern void MixXA(void);

+extern void FeedXA(xa_decode_t *xap);

+extern void FeedCDDA(unsigned char *pcm, int nBytes);

diff --git a/plugins/dfxvideo/prim.c b/plugins/dfxvideo/prim.c
index ed9474c1..0372cb4a 100644
--- a/plugins/dfxvideo/prim.c
+++ b/plugins/dfxvideo/prim.c
@@ -155,7 +155,7 @@ static __inline void SetRenderMode(uint32_t DrawAttributes)
 #define CHKMAX_X 1024

 #define CHKMAX_Y 512

 

-void AdjustCoord4()

+static void AdjustCoord4()

 {

  lx0=(short)(((int)lx0<<SIGNSHIFT)>>SIGNSHIFT);

  lx1=(short)(((int)lx1<<SIGNSHIFT)>>SIGNSHIFT);

@@ -167,7 +167,7 @@ void AdjustCoord4()
  ly3=(short)(((int)ly3<<SIGNSHIFT)>>SIGNSHIFT);

 }

 

-void AdjustCoord3()

+static void AdjustCoord3()

 {

  lx0=(short)(((int)lx0<<SIGNSHIFT)>>SIGNSHIFT);

  lx1=(short)(((int)lx1<<SIGNSHIFT)>>SIGNSHIFT);

@@ -177,7 +177,7 @@ void AdjustCoord3()
  ly2=(short)(((int)ly2<<SIGNSHIFT)>>SIGNSHIFT);

 }

 

-void AdjustCoord2()

+static void AdjustCoord2()

 {

  lx0=(short)(((int)lx0<<SIGNSHIFT)>>SIGNSHIFT);

  lx1=(short)(((int)lx1<<SIGNSHIFT)>>SIGNSHIFT);

@@ -185,7 +185,7 @@ void AdjustCoord2()
  ly1=(short)(((int)ly1<<SIGNSHIFT)>>SIGNSHIFT);

 }

 

-void AdjustCoord1()

+static void AdjustCoord1()

 {

  lx0=(short)(((int)lx0<<SIGNSHIFT)>>SIGNSHIFT);

  ly0=(short)(((int)ly0<<SIGNSHIFT)>>SIGNSHIFT);

diff --git a/plugins/dfxvideo/soft.c b/plugins/dfxvideo/soft.c
index ebe02760..fda9eb43 100644
--- a/plugins/dfxvideo/soft.c
+++ b/plugins/dfxvideo/soft.c
@@ -211,7 +211,7 @@ unsigned char dithertable[16] =
     4, 3, 5, 2

 };

 

-void Dither16(unsigned short * pdest,uint32_t r,uint32_t g,uint32_t b,unsigned short sM)

+static void Dither16(unsigned short * pdest,uint32_t r,uint32_t g,uint32_t b,unsigned short sM)

 {

  unsigned char coeff;

  unsigned char rlow, glow, blow;

diff --git a/plugins/peopsxgl/gpu.c b/plugins/peopsxgl/gpu.c
index de64252b..d30da6ce 100644
--- a/plugins/peopsxgl/gpu.c
+++ b/plugins/peopsxgl/gpu.c
@@ -62,6 +62,10 @@ static int iOldMode=0;
 #define N_(x) (x)

 #endif

 

+#ifdef _MACGL

+#include "drawgl.h"

+#endif

+

 ////////////////////////////////////////////////////////////////////////

 // PPDK developer must change libraryName field and can change revision and build

 ////////////////////////////////////////////////////////////////////////