diff options
Diffstat (limited to 'plugins/ao/eng_psf/peops2')
-rw-r--r-- | plugins/ao/eng_psf/peops2/adsr.h | 4 | ||||
-rw-r--r-- | plugins/ao/eng_psf/peops2/adsr2.c | 4 | ||||
-rw-r--r-- | plugins/ao/eng_psf/peops2/reverb2.c | 14 | ||||
-rw-r--r-- | plugins/ao/eng_psf/peops2/spu2.c | 6 |
4 files changed, 14 insertions, 14 deletions
diff --git a/plugins/ao/eng_psf/peops2/adsr.h b/plugins/ao/eng_psf/peops2/adsr.h index 777a0d84..fc031ef0 100644 --- a/plugins/ao/eng_psf/peops2/adsr.h +++ b/plugins/ao/eng_psf/peops2/adsr.h @@ -24,5 +24,5 @@ //
//*************************************************************************//
-INLINE void StartADSR(int ch);
-INLINE int MixADSR(int ch);
+static INLINE void StartADSR(int ch);
+static INLINE int MixADSR(int ch);
diff --git a/plugins/ao/eng_psf/peops2/adsr2.c b/plugins/ao/eng_psf/peops2/adsr2.c index 470069c6..79af6c03 100644 --- a/plugins/ao/eng_psf/peops2/adsr2.c +++ b/plugins/ao/eng_psf/peops2/adsr2.c @@ -66,7 +66,7 @@ void InitADSR(void) // INIT ADSR ////////////////////////////////////////////////////////////////////////
-INLINE void StartADSR(spu2_state_t *spu, int ch) // MIX ADSR
+static INLINE void StartADSR(spu2_state_t *spu, int ch) // MIX ADSR
{
spu->s_chan[ch].ADSRX.lVolume=1; // and init some adsr vars
spu->s_chan[ch].ADSRX.State=0;
@@ -75,7 +75,7 @@ INLINE void StartADSR(spu2_state_t *spu, int ch) // MIX ////////////////////////////////////////////////////////////////////////
-INLINE int MixADSR(spu2_state_t *spu, int ch) // MIX ADSR
+static INLINE int MixADSR(spu2_state_t *spu, int ch) // MIX ADSR
{
if(spu->s_chan[ch].bStop) // should be stopped:
{ // do release
diff --git a/plugins/ao/eng_psf/peops2/reverb2.c b/plugins/ao/eng_psf/peops2/reverb2.c index e939be87..f8a80661 100644 --- a/plugins/ao/eng_psf/peops2/reverb2.c +++ b/plugins/ao/eng_psf/peops2/reverb2.c @@ -51,7 +51,7 @@ // START REVERB
////////////////////////////////////////////////////////////////////////
-INLINE void StartREVERB(spu2_state_t *spu, int ch)
+static INLINE void StartREVERB(spu2_state_t *spu, int ch)
{
int core=ch/24;
@@ -66,7 +66,7 @@ INLINE void StartREVERB(spu2_state_t *spu, int ch) // HELPER FOR NEILL'S REVERB: re-inits our reverb mixing buf
////////////////////////////////////////////////////////////////////////
-INLINE void InitREVERB(spu2_state_t *spu)
+static INLINE void InitREVERB(spu2_state_t *spu)
{
if(spu->iUseReverb==1)
{
@@ -79,7 +79,7 @@ INLINE void InitREVERB(spu2_state_t *spu) // STORE REVERB
////////////////////////////////////////////////////////////////////////
-INLINE void StoreREVERB(spu2_state_t *spu, int ch,int ns)
+static INLINE void StoreREVERB(spu2_state_t *spu, int ch,int ns)
{
int core=ch/24;
@@ -99,7 +99,7 @@ INLINE void StoreREVERB(spu2_state_t *spu, int ch,int ns) ////////////////////////////////////////////////////////////////////////
-INLINE int g_buffer(spu2_state_t *spu, int iOff,int core) // get_buffer content helper: takes care about wraps
+static INLINE int g_buffer(spu2_state_t *spu, int iOff,int core) // get_buffer content helper: takes care about wraps
{
short * p=(short *)spu->spuMem;
iOff=(iOff)+spu->rvb[core].CurrAddr;
@@ -110,7 +110,7 @@ INLINE int g_buffer(spu2_state_t *spu, int iOff,int core) // g ////////////////////////////////////////////////////////////////////////
-INLINE void s_buffer(spu2_state_t *spu, int iOff,int iVal,int core) // set_buffer content helper: takes care about wraps and clipping
+static INLINE void s_buffer(spu2_state_t *spu, int iOff,int iVal,int core) // set_buffer content helper: takes care about wraps and clipping
{
short * p=(short *)spu->spuMem;
iOff=(iOff)+spu->rvb[core].CurrAddr;
@@ -122,7 +122,7 @@ INLINE void s_buffer(spu2_state_t *spu, int iOff,int iVal,int core) // se ////////////////////////////////////////////////////////////////////////
-INLINE void s_buffer1(spu2_state_t *spu, int iOff,int iVal,int core) // set_buffer (+1 sample) content helper: takes care about wraps and clipping
+static INLINE void s_buffer1(spu2_state_t *spu, int iOff,int iVal,int core) // set_buffer (+1 sample) content helper: takes care about wraps and clipping
{
short * p=(short *)spu->spuMem;
iOff=(iOff)+spu->rvb[core].CurrAddr+1;
@@ -221,7 +221,7 @@ static INLINE int MixREVERBLeft(spu2_state_t *spu, int ns,int core) ////////////////////////////////////////////////////////////////////////
-INLINE int MixREVERBRight(spu2_state_t *spu, int core)
+static INLINE int MixREVERBRight(spu2_state_t *spu, int core)
{
if(spu->iUseReverb==1) // Neill's reverb:
{
diff --git a/plugins/ao/eng_psf/peops2/spu2.c b/plugins/ao/eng_psf/peops2/spu2.c index 44546170..32f56ff0 100644 --- a/plugins/ao/eng_psf/peops2/spu2.c +++ b/plugins/ao/eng_psf/peops2/spu2.c @@ -170,7 +170,7 @@ const int f[5][2] = { { 0, 0 }, // -INLINE void InterpolateUp(spu2_state_t *spu, int ch) +static INLINE void InterpolateUp(spu2_state_t *spu, int ch) { if(spu->s_chan[ch].SB[32]==1) // flag == 1? calc step and set flag... and don't change the value in this pass { @@ -218,7 +218,7 @@ INLINE void InterpolateUp(spu2_state_t *spu, int ch) // even easier interpolation on downsampling, also no special filter, again just "Pete's common sense" tm // -INLINE void InterpolateDown(spu2_state_t *spu, int ch) +static INLINE void InterpolateDown(spu2_state_t *spu, int ch) { if(spu->s_chan[ch].sinc>=0x20000L) // we would skip at least one val? { @@ -244,7 +244,7 @@ INLINE void InterpolateDown(spu2_state_t *spu, int ch) // START SOUND... called by main thread to setup a new sound on a channel //////////////////////////////////////////////////////////////////////// -INLINE void StartSound(spu2_state_t *spu, int ch) +static INLINE void StartSound(spu2_state_t *spu, int ch) { spu->dwNewChannel2[ch/24]&=~(1<<(ch%24)); // clear new channel bit spu->dwEndChannel2[ch/24]&=~(1<<(ch%24)); // clear end channel bit |