From b205e6323f8b10c9dcbfb9fd21e7cb896b3805ef Mon Sep 17 00:00:00 2001 From: "SND\\MaddTheSane_cp" Date: Fri, 16 Dec 2011 02:22:49 +0000 Subject: DFSound: change extern inlines to static inlines. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@73330 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- plugins/dfsound/adsr.c | 4 ++-- plugins/dfsound/adsr.h | 4 ++-- plugins/dfsound/reverb.c | 4 ++-- plugins/dfsound/reverb.h | 4 ++-- plugins/dfsound/xa.c | 6 +++--- plugins/dfsound/xa.h | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) (limited to 'plugins') diff --git a/plugins/dfsound/adsr.c b/plugins/dfsound/adsr.c index e13b2827..1aacfcd0 100644 --- a/plugins/dfsound/adsr.c +++ b/plugins/dfsound/adsr.c @@ -142,7 +142,7 @@ void InitADSR(void) // INIT ADSR //////////////////////////////////////////////////////////////////////// -extern INLINE void StartADSR(int ch) // MIX ADSR +static INLINE void StartADSR(int ch) // MIX ADSR { s_chan[ch].ADSRX.lVolume=1; // and init some adsr vars s_chan[ch].ADSRX.State=0; @@ -152,7 +152,7 @@ extern INLINE void StartADSR(int ch) // MIX ADSR //////////////////////////////////////////////////////////////////////// -extern INLINE int MixADSR(int ch) // MIX ADSR +static INLINE int MixADSR(int ch) // MIX ADSR { int EnvelopeVol = s_chan[ch].ADSRX.EnvelopeVol; int EnvelopeVol_f = s_chan[ch].ADSRX.EnvelopeVol_f; diff --git a/plugins/dfsound/adsr.h b/plugins/dfsound/adsr.h index 0251cf11..50c89f46 100644 --- a/plugins/dfsound/adsr.h +++ b/plugins/dfsound/adsr.h @@ -15,5 +15,5 @@ * * ***************************************************************************/ -extern INLINE void StartADSR(int ch); -extern INLINE int MixADSR(int ch); +static INLINE void StartADSR(int ch); +static INLINE int MixADSR(int ch); diff --git a/plugins/dfsound/reverb.c b/plugins/dfsound/reverb.c index 3ec38f24..0e0a1232 100644 --- a/plugins/dfsound/reverb.c +++ b/plugins/dfsound/reverb.c @@ -63,7 +63,7 @@ void SetREVERB(unsigned short val) // START REVERB //////////////////////////////////////////////////////////////////////// -extern INLINE void StartREVERB(int ch) +static INLINE void StartREVERB(int ch) { if(s_chan[ch].bReverb && (spuCtrl&0x80)) // reverb possible? { @@ -112,7 +112,7 @@ static INLINE void StoreREVERB_CD(int left, int right,int ns) } -extern INLINE void StoreREVERB(int ch,int ns) +static INLINE void StoreREVERB(int ch,int ns) { if(iUseReverb==0) return; else diff --git a/plugins/dfsound/reverb.h b/plugins/dfsound/reverb.h index c3a5826b..9aacd52c 100644 --- a/plugins/dfsound/reverb.h +++ b/plugins/dfsound/reverb.h @@ -16,6 +16,6 @@ ***************************************************************************/ void SetREVERB(unsigned short val); -extern INLINE void StartREVERB(int ch); -extern INLINE void StoreREVERB(int ch,int ns); +static INLINE void StartREVERB(int ch); +static INLINE void StoreREVERB(int ch,int ns); diff --git a/plugins/dfsound/xa.c b/plugins/dfsound/xa.c index 1becc903..6c1f3608 100644 --- a/plugins/dfsound/xa.c +++ b/plugins/dfsound/xa.c @@ -62,7 +62,7 @@ long cdxa_dbuf_ptr; static int lastxa_lc, lastxa_rc; static int lastcd_lc, lastcd_rc; -extern INLINE void MixXA(void) +static INLINE void MixXA(void) { int ns; int lc,rc; @@ -260,7 +260,7 @@ unsigned long timeGetTime_spu() // FEED XA //////////////////////////////////////////////////////////////////////// -extern INLINE void FeedXA(xa_decode_t *xap) +static INLINE void FeedXA(xa_decode_t *xap) { int sinc,spos,i,iSize,iPlace; @@ -451,7 +451,7 @@ extern INLINE void FeedXA(xa_decode_t *xap) unsigned int cdda_ptr; -extern INLINE void FeedCDDA(unsigned char *pcm, int nBytes) +static INLINE void FeedCDDA(unsigned char *pcm, int nBytes) { while(nBytes>0) { diff --git a/plugins/dfsound/xa.h b/plugins/dfsound/xa.h index b28e6f7a..7f8b6e0c 100644 --- a/plugins/dfsound/xa.h +++ b/plugins/dfsound/xa.h @@ -15,6 +15,6 @@ * * ***************************************************************************/ -extern INLINE void MixXA(void); -extern INLINE void FeedXA(xa_decode_t *xap); -extern INLINE void FeedCDDA(unsigned char *pcm, int nBytes); +static INLINE void MixXA(void); +static INLINE void FeedXA(xa_decode_t *xap); +static INLINE void FeedCDDA(unsigned char *pcm, int nBytes); -- cgit v1.2.3