From: notaz <notasas@gmail.com>
Date: Fri, 19 Dec 2014 01:33:20 +0000 (+0200)
Subject: spu: put globals into a structure
X-Git-Tag: r20~26
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3154bfab51566cbaa5bce3965d4c915bfb1b4f53;p=pcsx_rearmed.git

spu: put globals into a structure

- also clean up some unused stuff
- put spu config into it's own structure and header
---

diff --git a/frontend/main.c b/frontend/main.c
index acebaaee..426ef138 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -25,6 +25,7 @@
 #include "../libpcsxcore/cheat.h"
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
 #include "../plugins/cdrcimg/cdrcimg.h"
+#include "../plugins/dfsound/spu_config.h"
 #include "revision.h"
 
 #ifndef NO_FRONTEND
@@ -44,12 +45,6 @@ static void check_memcards(void);
 void StartDebugger();
 void StopDebugger();
 
-// sound plugin
-extern int iUseReverb;
-extern int iUseInterpolation;
-extern int iXAPitch;
-extern int iVolume;
-
 int ready_to_go, g_emu_want_quit, g_emu_resetting;
 unsigned long gpuDisp;
 char cfgfile_basename[MAXPATHLEN];
@@ -141,13 +136,15 @@ void emu_set_default_config(void)
 	pl_rearmed_cbs.gpu_peopsgl.iVRamSize = 64;
 	pl_rearmed_cbs.gpu_peopsgl.iTexGarbageCollection = 1;
 
-	iUseReverb = 2;
-	iUseInterpolation = 1;
-	iXAPitch = 0;
-	iVolume = 768;
-#ifndef __ARM_ARCH_7A__ /* XXX */
-	iUseReverb = 0;
-	iUseInterpolation = 0;
+	spu_config.iUseReverb = 1;
+	spu_config.iUseInterpolation = 1;
+	spu_config.iXAPitch = 0;
+	spu_config.iVolume = 768;
+	spu_config.iTempo = 0;
+#if defined(__arm__) && !defined(__ARM_ARCH_7A__) /* XXX */
+	spu_config.iUseReverb = 0;
+	spu_config.iUseInterpolation = 0;
+	spu_config.iTempo = 1;
 #endif
 	new_dynarec_hacks = 0;
 	cycle_multiplier = 200;
diff --git a/frontend/menu.c b/frontend/menu.c
index 199020d2..15627356 100644
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -37,6 +37,7 @@
 #include "../libpcsxcore/cheat.h"
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
 #include "../plugins/dfinput/externals.h"
+#include "../plugins/dfsound/spu_config.h"
 #include "psemu_plugin_defs.h"
 #include "revision.h"
 
@@ -102,12 +103,6 @@ int soft_filter;
 #define DEFAULT_PSX_CLOCK_S "50"
 #endif
 
-// sound plugin
-extern int iUseReverb;
-extern int iUseInterpolation;
-extern int iXAPitch;
-extern int iVolume;
-
 static const char *bioses[24];
 static const char *gpu_plugins[16];
 static const char *spu_plugins[16];
@@ -318,7 +313,7 @@ static void menu_sync_config(void)
 		allow_abs_only_old = in_evdev_allow_abs_only;
 	}
 
-	iVolume = 768 + 128 * volume_boost;
+	spu_config.iVolume = 768 + 128 * volume_boost;
 	pl_rearmed_cbs.frameskip = frameskip - 1;
 	pl_timing_prepare(Config.PsxType);
 }
@@ -431,9 +426,10 @@ static const struct {
 	CE_INTVAL_P(gpu_peopsgl.iVRamSize),
 	CE_INTVAL_P(gpu_peopsgl.iTexGarbageCollection),
 	CE_INTVAL_P(gpu_peopsgl.dwActFixes),
-	CE_INTVAL_V(iUseReverb, 3),
-	CE_INTVAL_V(iXAPitch, 3),
-	CE_INTVAL_V(iUseInterpolation, 3),
+	CE_INTVAL(spu_config.iUseReverb),
+	CE_INTVAL(spu_config.iXAPitch),
+	CE_INTVAL(spu_config.iUseInterpolation),
+	CE_INTVAL(spu_config.iTempo),
 	CE_INTVAL(config_save_counter),
 	CE_INTVAL(in_evdev_allow_abs_only),
 	CE_INTVAL(volume_boost),
@@ -1400,13 +1396,16 @@ static int menu_loop_plugin_gpu_peopsgl(int id, int keys)
 
 static const char *men_spu_interp[] = { "None", "Simple", "Gaussian", "Cubic", NULL };
 static const char h_spu_volboost[]  = "Large values cause distortion";
+static const char h_spu_tempo[]     = "Slows down audio if emu is too slow\n"
+				      "This is inaccurate and breaks games";
 
 static menu_entry e_menu_plugin_spu[] =
 {
 	mee_range_h   ("Volume boost",              0, volume_boost, -5, 30, h_spu_volboost),
-	mee_onoff     ("Reverb",                    0, iUseReverb, 2),
-	mee_enum      ("Interpolation",             0, iUseInterpolation, men_spu_interp),
-	mee_onoff     ("Adjust XA pitch",           0, iXAPitch, 1),
+	mee_onoff     ("Reverb",                    0, spu_config.iUseReverb, 1),
+	mee_enum      ("Interpolation",             0, spu_config.iUseInterpolation, men_spu_interp),
+	mee_onoff     ("Adjust XA pitch",           0, spu_config.iXAPitch, 1),
+	mee_onoff_h   ("Adjust tempo",              0, spu_config.iTempo, 1, h_spu_tempo),
 	mee_end,
 };
 
diff --git a/maemo/main.c b/maemo/main.c
index 87e0e2c9..85db400b 100644
--- a/maemo/main.c
+++ b/maemo/main.c
@@ -18,16 +18,13 @@
 #include "../libpcsxcore/cdriso.h"
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
 #include "../plugins/dfinput/main.h"
+#include "../plugins/dfsound/spu_config.h"
 #include "maemo_common.h"
 
 extern int in_enable_vibration;
 extern int cycle_multiplier;
 extern int in_type1, in_type2;
 
-// sound plugin
-extern int iUseReverb;
-extern int iUseInterpolation;
-
 accel_option accelOptions;
 int ready_to_go, g_emu_want_quit, g_emu_resetting;
 int g_menuscreen_w, g_menuscreen_h;
@@ -198,8 +195,8 @@ int main(int argc, char **argv)
 	Config.PsxAuto = 1;
 	pl_rearmed_cbs.frameskip = -1;
 	strcpy(Config.Bios, "HLE");
-    iUseReverb = 0;
-    iUseInterpolation = 0;
+	spu_config.iUseReverb = 1;
+	spu_config.iUseInterpolation = 1;
 
 	in_type1 = PSE_PAD_TYPE_STANDARD;
 	in_type2 = PSE_PAD_TYPE_STANDARD;
@@ -288,8 +285,8 @@ int main(int argc, char **argv)
 			}
 	}
 
-		else if (!strcmp(argv[i], "-spu_reverb"))           { if (atol(argv[++i]) > 0) iUseReverb = 2; }
-		else if (!strcmp(argv[i], "-spu_interpolation")) 	iUseInterpolation = atol(argv[++i]);
+		else if (!strcmp(argv[i], "-spu_reverb"))		spu_config.iUseReverb = atol(argv[++i]);
+		else if (!strcmp(argv[i], "-spu_interpolation")) 	spu_config.iUseInterpolation = atol(argv[++i]);
 
 		else if (!strcmp(argv[i], "-enhance")) 			pl_rearmed_cbs.gpu_neon.enhancement_enable = 1;
 		else if (!strcmp(argv[i], "-enhancehack")) 		pl_rearmed_cbs.gpu_neon.enhancement_no_main = 1;
diff --git a/plugins/dfsound/adsr.c b/plugins/dfsound/adsr.c
index 79f593ca..c1e98b32 100644
--- a/plugins/dfsound/adsr.c
+++ b/plugins/dfsound/adsr.c
@@ -218,7 +218,7 @@ done:
 stop:
  memset(&ChanBuf[ns], 0, (ns_to - ns) * sizeof(ChanBuf[0]));
  s_chan[ch].ADSRX.EnvelopeVol = 0;
- dwChannelOn &= ~(1<<ch);
+ spu.dwChannelOn &= ~(1<<ch);
 }
 
 #endif
diff --git a/plugins/dfsound/arm_utils.S b/plugins/dfsound/arm_utils.S
index 40794719..1726389a 100644
--- a/plugins/dfsound/arm_utils.S
+++ b/plugins/dfsound/arm_utils.S
@@ -15,7 +15,6 @@
 .align 2
 ptr_ChanBuf:   .word ESYM(ChanBuf)
 ptr_SSumLR:    .word ESYM(SSumLR)
-ptr_sRVBStart: .word ESYM(sRVBStart)
 #endif
 
 .text
@@ -70,14 +69,13 @@ mc_finish:
     bx          lr
 
 
-FUNCTION(mix_chan_rvb): @ (int start, int count, int lv, int rv)
+FUNCTION(mix_chan_rvb): @ (int start, int count, int lv, int rv, int *rvb)
     vmov.32     d14[0], r2
     vmov.32     d14[1], r3             @ multipliers
     mov         r12, r0
     load_varadr r0, ChanBuf
-    load_varadr r3, sRVBStart
+    ldr         r3, [sp]               @ rvb
     load_varadr r2, SSumLR
-    ldr         r3, [r3]
     add         r0, r12, lsl #2
     add         r2, r12, lsl #3
     add         r3, r12, lsl #3
@@ -143,14 +141,13 @@ mc_finish:
     ldmfd       sp!, {r4-r8,pc}
 
 
-FUNCTION(mix_chan_rvb): @ (int start, int count, int lv, int rv)
+FUNCTION(mix_chan_rvb): @ (int start, int count, int lv, int rv, int *rvb)
     stmfd       sp!, {r4-r8,lr}
     orr         lr, r2, r3, lsl #16
     lsl         lr, #1
-    load_varadr r3, sRVBStart
+    ldr         r3, [sp]               @ rvb
     load_varadr r2, SSumLR
     load_varadr r4, ChanBuf
-    ldr         r3, [r3]
     add         r2, r2, r0, lsl #3
     add         r3, r3, r0, lsl #3
     add         r0, r4, r0, lsl #2
diff --git a/plugins/dfsound/dma.c b/plugins/dfsound/dma.c
index 85b746ce..d3706b92 100644
--- a/plugins/dfsound/dma.c
+++ b/plugins/dfsound/dma.c
@@ -27,9 +27,9 @@
 
 unsigned short CALLBACK SPUreadDMA(void)
 {
- unsigned short s=spuMem[spuAddr>>1];
- spuAddr+=2;
- if(spuAddr>0x7ffff) spuAddr=0;
+ unsigned short s=spu.spuMem[spu.spuAddr>>1];
+ spu.spuAddr+=2;
+ if(spu.spuAddr>0x7ffff) spu.spuAddr=0;
 
  return s;
 }
@@ -47,9 +47,9 @@ void CALLBACK SPUreadDMAMem(unsigned short *pusPSXMem, int iSize,
 
  for(i=0;i<iSize;i++)
   {
-   *pusPSXMem++=spuMem[spuAddr>>1];                    // spu addr got by writeregister
-   spuAddr+=2;                                         // inc spu addr
-   if(spuAddr>0x7ffff) spuAddr=0;                      // wrap
+   *pusPSXMem++=spu.spuMem[spu.spuAddr>>1];            // spu addr got by writeregister
+   spu.spuAddr+=2;                                     // inc spu addr
+   if(spu.spuAddr>0x7ffff) spu.spuAddr=0;              // wrap
   }
 }
 
@@ -67,10 +67,10 @@ void CALLBACK SPUreadDMAMem(unsigned short *pusPSXMem, int iSize,
   
 void CALLBACK SPUwriteDMA(unsigned short val)
 {
- spuMem[spuAddr>>1] = val;                             // spu addr got by writeregister
+ spu.spuMem[spu.spuAddr>>1] = val;                     // spu addr got by writeregister
 
- spuAddr+=2;                                           // inc spu addr
- if(spuAddr>0x7ffff) spuAddr=0;                        // wrap
+ spu.spuAddr+=2;                                       // inc spu addr
+ if(spu.spuAddr>0x7ffff) spu.spuAddr=0;                // wrap
 }
 
 ////////////////////////////////////////////////////////////////////////
@@ -84,18 +84,18 @@ void CALLBACK SPUwriteDMAMem(unsigned short *pusPSXMem, int iSize,
  
  do_samples_if_needed(cycles);
 
- if(spuAddr + iSize*2 < 0x80000)
+ if(spu.spuAddr + iSize*2 < 0x80000)
   {
-   memcpy(&spuMem[spuAddr>>1], pusPSXMem, iSize*2);
-   spuAddr += iSize*2;
+   memcpy(&spu.spuMem[spu.spuAddr>>1], pusPSXMem, iSize*2);
+   spu.spuAddr += iSize*2;
    return;
   }
 
  for(i=0;i<iSize;i++)
   {
-   spuMem[spuAddr>>1] = *pusPSXMem++;                  // spu addr got by writeregister
-   spuAddr+=2;                                         // inc spu addr
-   spuAddr&=0x7ffff;                                   // wrap
+   spu.spuMem[spu.spuAddr>>1] = *pusPSXMem++;          // spu addr got by writeregister
+   spu.spuAddr+=2;                                     // inc spu addr
+   spu.spuAddr&=0x7ffff;                               // wrap
   }
 }
 
diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h
index 90963992..7935cb99 100644
--- a/plugins/dfsound/externals.h
+++ b/plugins/dfsound/externals.h
@@ -165,96 +165,83 @@ typedef struct
  int nFB_SRC_A0, nFB_SRC_A1, nFB_SRC_B0, nFB_SRC_B1;
 } REVERBInfo;
 
-///////////////////////////////////////////////////////////
-// SPU.C globals
 ///////////////////////////////////////////////////////////
 
-#ifndef _IN_SPU
-
 // psx buffers / addresses
 
-extern unsigned short  regArea[];                        
-extern unsigned short  spuMem[];
-extern unsigned char * spuMemC;
-extern unsigned char * pSpuIrq;
-extern unsigned char * pSpuBuffer;
+typedef struct
+{
+ unsigned short  spuCtrl;
+ unsigned short  spuStat;
 
-#define regAreaGet(ch,offset) \
-  regArea[((ch<<4)|(offset))>>1]
+ unsigned int    spuAddr;
+ unsigned char * spuMemC;
+ unsigned char * pSpuIrq;
 
-// user settings
+ unsigned int    cycles_played;
+ int             decode_pos;
+ int             decode_dirty_ch;
+ unsigned int    bSpuInit:1;
+ unsigned int    bSPUIsOpen:1;
 
-extern int        iVolume;
-extern int        iXAPitch;
-extern int        iUseReverb;
-extern int        iUseInterpolation;
-// MISC
+ unsigned int    dwNoiseVal;           // global noise generator
+ unsigned int    dwNoiseCount;
+ unsigned int    dwNewChannel;         // flags for faster testing, if new channel starts
+ unsigned int    dwChannelOn;          // not silent channels
+ unsigned int    dwChannelDead;        // silent+not useful channels
 
-extern int decode_pos;
+ unsigned char * pSpuBuffer;
+ short         * pS;
 
-extern SPUCHAN s_chan[];
-extern REVERBInfo rvb;
+ void (CALLBACK *irqCallback)(void);   // func of main emu, called on spu irq
+ void (CALLBACK *cddavCallback)(unsigned short,unsigned short);
+ void (CALLBACK *scheduleCallback)(unsigned int);
 
-extern unsigned short spuCtrl;
-extern unsigned short spuStat;
-extern unsigned short spuIrq;
-extern unsigned int   spuAddr;
-extern int      bSpuInit;
-extern unsigned int dwNewChannel;
-extern unsigned int dwChannelOn;
-extern unsigned int dwPendingChanOff;
-extern unsigned int dwChannelDead;
+ int           * sRVBStart;
 
-extern int      SSumR[];
-extern int      SSumL[];
-extern short *  pS;
+ xa_decode_t   * xapGlobal;
+ unsigned int  * XAFeed;
+ unsigned int  * XAPlay;
+ unsigned int  * XAStart;
+ unsigned int  * XAEnd;
 
-extern void (CALLBACK *cddavCallback)(unsigned short,unsigned short);
+ unsigned int  * CDDAFeed;
+ unsigned int  * CDDAPlay;
+ unsigned int  * CDDAStart;
+ unsigned int  * CDDAEnd;
 
-extern unsigned int cycles_played;
+ unsigned int    XARepeat;
+ unsigned int    XALastVal;
 
-void do_samples(unsigned int cycles_to);
-void schedule_next_irq(void);
-
-#define do_samples_if_needed(c) \
- do { \
-  if ((int)((c) - cycles_played) >= 16 * 768) \
-   do_samples(c); \
- } while (0)
+ int             iLeftXAVol;
+ int             iRightXAVol;
 
-#endif
+ int             pad[32];
+ unsigned short  regArea[0x400];
+ unsigned short  spuMem[256*1024];
+} SPUInfo;
 
 ///////////////////////////////////////////////////////////
-// XA.C globals
+// SPU.C globals
 ///////////////////////////////////////////////////////////
 
-#ifndef _IN_XA
+#ifndef _IN_SPU
 
-extern xa_decode_t   * xapGlobal;
+extern SPUInfo spu;
+extern SPUCHAN s_chan[];
+extern REVERBInfo rvb;
 
-extern uint32_t * XAFeed;
-extern uint32_t * XAPlay;
-extern uint32_t * XAStart;
-extern uint32_t * XAEnd;
+void do_samples(unsigned int cycles_to);
+void schedule_next_irq(void);
 
-extern uint32_t * CDDAFeed;
-extern uint32_t * CDDAPlay;
-extern uint32_t * CDDAStart;
-extern uint32_t * CDDAEnd;
+#define regAreaGet(ch,offset) \
+  spu.regArea[((ch<<4)|(offset))>>1]
 
-extern int           iLeftXAVol;
-extern int           iRightXAVol;
+#define do_samples_if_needed(c) \
+ do { \
+  if ((int)((c) - spu.cycles_played) >= 16 * 768) \
+   do_samples(c); \
+ } while (0)
 
 #endif
 
-///////////////////////////////////////////////////////////
-// REVERB.C globals
-///////////////////////////////////////////////////////////
-
-#ifndef _IN_REVERB
-
-extern int *          sRVBPlay;
-extern int *          sRVBEnd;
-extern int *          sRVBStart;
-
-#endif
diff --git a/plugins/dfsound/freeze.c b/plugins/dfsound/freeze.c
index 9fa29f04..b865b848 100644
--- a/plugins/dfsound/freeze.c
+++ b/plugins/dfsound/freeze.c
@@ -139,7 +139,7 @@ void LoadStateUnknown(SPUFreeze_t * pF, uint32_t cycles); // unknown format
 static void save_channel(SPUCHAN_orig *d, const SPUCHAN *s, int ch)
 {
  memset(d, 0, sizeof(*d));
- d->bNew = !!(dwNewChannel & (1<<ch));
+ d->bNew = !!(spu.dwNewChannel & (1<<ch));
  d->iSBPos = s->iSBPos;
  d->spos = s->spos;
  d->sinc = s->sinc;
@@ -147,7 +147,7 @@ static void save_channel(SPUCHAN_orig *d, const SPUCHAN *s, int ch)
  d->iStart = (regAreaGet(ch,6)&~1)<<3;
  d->iCurr = 0; // set by the caller
  d->iLoop = 0; // set by the caller
- d->bOn = !!(dwChannelOn & (1<<ch));
+ d->bOn = !!(spu.dwChannelOn & (1<<ch));
  d->bStop = s->bStop;
  d->bReverb = s->bReverb;
  d->iActFreq = 1;
@@ -179,7 +179,7 @@ static void save_channel(SPUCHAN_orig *d, const SPUCHAN *s, int ch)
 static void load_channel(SPUCHAN *d, const SPUCHAN_orig *s, int ch)
 {
  memset(d, 0, sizeof(*d));
- if (s->bNew) dwNewChannel |= 1<<ch;
+ if (s->bNew) spu.dwNewChannel |= 1<<ch;
  d->iSBPos = s->iSBPos;
  if ((uint32_t)d->iSBPos >= 28) d->iSBPos = 27;
  d->spos = s->spos;
@@ -208,14 +208,14 @@ static void load_channel(SPUCHAN *d, const SPUCHAN_orig *s, int ch)
  d->ADSRX.ReleaseModeExp = s->ADSRX.ReleaseModeExp;
  d->ADSRX.ReleaseRate = s->ADSRX.ReleaseRate;
  d->ADSRX.EnvelopeVol = s->ADSRX.EnvelopeVol;
- if (s->bOn) dwChannelOn |= 1<<ch;
+ if (s->bOn) spu.dwChannelOn |= 1<<ch;
  else d->ADSRX.EnvelopeVol = 0;
 }
 
 // force load from regArea to variables
 static void load_register(unsigned long reg, unsigned int cycles)
 {
- unsigned short *r = &regArea[((reg & 0xfff) - 0xc00) >> 1];
+ unsigned short *r = &spu.regArea[((reg & 0xfff) - 0xc00) >> 1];
  *r ^= 1;
  SPUwriteRegister(reg, *r ^ 1, cycles);
 }
@@ -244,31 +244,31 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,
                                                        // save mode:
    do_samples(cycles);
 
-   memcpy(pF->cSPURam,spuMem,0x80000);                 // copy common infos
-   memcpy(pF->cSPUPort,regArea,0x200);
+   memcpy(pF->cSPURam,spu.spuMem,0x80000);             // copy common infos
+   memcpy(pF->cSPUPort,spu.regArea,0x200);
 
-   if(xapGlobal && XAPlay!=XAFeed)                     // some xa
+   if(spu.xapGlobal && spu.XAPlay!=spu.XAFeed)         // some xa
     {
-     pF->xaS=*xapGlobal;     
+     pF->xaS=*spu.xapGlobal;
     }
    else 
    memset(&pF->xaS,0,sizeof(xa_decode_t));             // or clean xa
 
    pFO=(SPUOSSFreeze_t *)(pF+1);                       // store special stuff
 
-   pFO->spuIrq=spuIrq;
-   if(pSpuIrq)  pFO->pSpuIrq  = (unsigned long)pSpuIrq-(unsigned long)spuMemC;
+   pFO->spuIrq = spu.regArea[(H_SPUirqAddr - 0x0c00) / 2];
+   if(spu.pSpuIrq) pFO->pSpuIrq  = (unsigned long)spu.pSpuIrq-(unsigned long)spu.spuMemC;
 
-   pFO->spuAddr=spuAddr;
+   pFO->spuAddr=spu.spuAddr;
    if(pFO->spuAddr==0) pFO->spuAddr=0xbaadf00d;
 
    for(i=0;i<MAXCHAN;i++)
     {
      save_channel(&pFO->s_chan[i],&s_chan[i],i);
      if(s_chan[i].pCurr)
-      pFO->s_chan[i].iCurr=s_chan[i].pCurr-spuMemC;
+      pFO->s_chan[i].iCurr=s_chan[i].pCurr-spu.spuMemC;
      if(s_chan[i].pLoop)
-      pFO->s_chan[i].iLoop=s_chan[i].pLoop-spuMemC;
+      pFO->s_chan[i].iLoop=s_chan[i].pLoop-spu.spuMemC;
     }
 
    return 1;
@@ -277,13 +277,13 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,
                                                        
  if(ulFreezeMode!=0) return 0;                         // bad mode? bye
 
- memcpy(spuMem,pF->cSPURam,0x80000);                   // get ram
- memcpy(regArea,pF->cSPUPort,0x200);
+ memcpy(spu.spuMem,pF->cSPURam,0x80000);               // get ram
+ memcpy(spu.regArea,pF->cSPUPort,0x200);
 
  if(pF->xaS.nsamples<=4032)                            // start xa again
   SPUplayADPCMchannel(&pF->xaS);
 
- xapGlobal=0;
+ spu.xapGlobal=0;
 
  if(!strcmp(pF->szSPUName,"PBOSS") && pF->ulFreezeVersion==5)
    LoadStateV5(pF);
@@ -305,7 +305,7 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,
  for(i=0;i<MAXCHAN;i++) s_chan[i].SB[28]=0;
 
  ClearWorkingState();
- cycles_played = cycles;
+ spu.cycles_played = cycles;
 
  return 1;
 }
@@ -318,24 +318,23 @@ void LoadStateV5(SPUFreeze_t * pF)
 
  pFO=(SPUOSSFreeze_t *)(pF+1);
 
- spuIrq = pFO->spuIrq;
- if(pFO->pSpuIrq) pSpuIrq = spuMemC+((long)pFO->pSpuIrq&0x7fff0); else pSpuIrq=NULL;
+ if(pFO->pSpuIrq) spu.pSpuIrq = spu.spuMemC+((long)pFO->pSpuIrq&0x7fff0); else spu.pSpuIrq=NULL;
 
  if(pFO->spuAddr)
   {
-   spuAddr = pFO->spuAddr;
-   if (spuAddr == 0xbaadf00d) spuAddr = 0;
+   spu.spuAddr = pFO->spuAddr;
+   if (spu.spuAddr == 0xbaadf00d) spu.spuAddr = 0;
   }
 
- dwNewChannel=0;
- dwChannelOn=0;
- dwChannelDead=0;
+ spu.dwNewChannel=0;
+ spu.dwChannelOn=0;
+ spu.dwChannelDead=0;
  for(i=0;i<MAXCHAN;i++)
   {
    load_channel(&s_chan[i],&pFO->s_chan[i],i);
 
-   s_chan[i].pCurr+=(unsigned long)spuMemC;
-   s_chan[i].pLoop+=(unsigned long)spuMemC;
+   s_chan[i].pCurr+=(unsigned long)spu.spuMemC;
+   s_chan[i].pLoop+=(unsigned long)spu.spuMemC;
   }
 }
 
@@ -348,13 +347,13 @@ void LoadStateUnknown(SPUFreeze_t * pF, uint32_t cycles)
  for(i=0;i<MAXCHAN;i++)
   {
    s_chan[i].bStop=0;
-   s_chan[i].pLoop=spuMemC;
+   s_chan[i].pLoop=spu.spuMemC;
   }
 
- dwNewChannel=0;
- dwChannelOn=0;
- dwChannelDead=0;
- pSpuIrq=0;
+ spu.dwNewChannel=0;
+ spu.dwChannelOn=0;
+ spu.dwChannelDead=0;
+ spu.pSpuIrq=0;
 
  for(i=0;i<0xc0;i++)
   {
diff --git a/plugins/dfsound/registers.c b/plugins/dfsound/registers.c
index 20a7c140..210adb2d 100644
--- a/plugins/dfsound/registers.c
+++ b/plugins/dfsound/registers.c
@@ -21,6 +21,7 @@
 
 #include "externals.h"
 #include "registers.h"
+#include "spu_config.h"
 
 static void SoundOn(int start,int end,unsigned short val);
 static void SoundOff(int start,int end,unsigned short val);
@@ -47,8 +48,8 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val,
 {
  int r = reg & 0xfff;
  int rofs = (r - 0xc00) >> 1;
- int changed = regArea[rofs] != val;
- regArea[rofs] = val;
+ int changed = spu.regArea[rofs] != val;
+ spu.regArea[rofs] = val;
 
  if (!changed && (ignore_dupe[rofs >> 5] & (1 << (rofs & 0x1f))))
   return;
@@ -110,7 +111,7 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val,
        break;
      //------------------------------------------------//
      case 14:                                          // loop?
-       s_chan[ch].pLoop=spuMemC+((val&~1)<<3);
+       s_chan[ch].pLoop=spu.spuMemC+((val&~1)<<3);
        goto upd_irq;
      //------------------------------------------------//
     }
@@ -121,26 +122,26 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val,
    {
     //-------------------------------------------------//
     case H_SPUaddr:
-      spuAddr = (unsigned long) val<<3;
+      spu.spuAddr = (unsigned long) val<<3;
       break;
     //-------------------------------------------------//
     case H_SPUdata:
-      spuMem[spuAddr>>1] = val;
-      spuAddr+=2;
-      if(spuAddr>0x7ffff) spuAddr=0;
+      spu.spuMem[spu.spuAddr>>1] = val;
+      spu.spuAddr+=2;
+      if(spu.spuAddr>0x7ffff) spu.spuAddr=0;
       break;
     //-------------------------------------------------//
     case H_SPUctrl:
-      if (!(spuCtrl & CTRL_IRQ)) {
-        spuStat&=~STAT_IRQ;
+      if (!(spu.spuCtrl & CTRL_IRQ)) {
+        spu.spuStat&=~STAT_IRQ;
         if (val & CTRL_IRQ)
          schedule_next_irq();
       }
-      spuCtrl=val;
+      spu.spuCtrl=val;
       break;
     //-------------------------------------------------//
     case H_SPUstat:
-      spuStat=val & 0xf800;
+      spu.spuStat=val&0xf800;
       break;
     //-------------------------------------------------//
     case H_SPUReverbAddr:
@@ -158,8 +159,7 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val,
       goto rvbd;
     //-------------------------------------------------//
     case H_SPUirqAddr:
-      spuIrq = val;
-      pSpuIrq=spuMemC+(((unsigned long) val<<3)&~0xf);
+      spu.pSpuIrq=spu.spuMemC+(((unsigned long) val<<3)&~0xf);
       goto upd_irq;
     //-------------------------------------------------//
     case H_SPUrvolL:
@@ -214,12 +214,12 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val,
       break;
     //-------------------------------------------------//
     case H_CDLeft:
-      iLeftXAVol=val  & 0x7fff;
-      if(cddavCallback) cddavCallback(0,val);
+      spu.iLeftXAVol=val  & 0x7fff;
+      if(spu.cddavCallback) spu.cddavCallback(0,val);
       break;
     case H_CDRight:
-      iRightXAVol=val & 0x7fff;
-      if(cddavCallback) cddavCallback(1,val);
+      spu.iRightXAVol=val & 0x7fff;
+      if(spu.cddavCallback) spu.cddavCallback(1,val);
       break;
     //-------------------------------------------------//
     case H_FMod1:
@@ -282,7 +282,7 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val,
  return;
 
 upd_irq:
- if (spuCtrl & CTRL_IRQ)
+ if (spu.spuCtrl & CTRL_IRQ)
   schedule_next_irq();
  return;
 
@@ -305,8 +305,8 @@ unsigned short CALLBACK SPUreadRegister(unsigned long reg)
      case 12:                                          // get adsr vol
       {
        const int ch=(r>>4)-0xc0;
-       if(dwNewChannel&(1<<ch)) return 1;              // we are started, but not processed? return 1
-       if((dwChannelOn&(1<<ch)) &&                     // same here... we haven't decoded one sample yet, so no envelope yet. return 1 as well
+       if(spu.dwNewChannel&(1<<ch)) return 1;          // we are started, but not processed? return 1
+       if((spu.dwChannelOn&(1<<ch)) &&                 // same here... we haven't decoded one sample yet, so no envelope yet. return 1 as well
           !s_chan[ch].ADSRX.EnvelopeVol)
         return 1;
        return (unsigned short)(s_chan[ch].ADSRX.EnvelopeVol>>16);
@@ -315,7 +315,7 @@ unsigned short CALLBACK SPUreadRegister(unsigned long reg)
      case 14:                                          // get loop address
       {
        const int ch=(r>>4)-0xc0;
-       return (unsigned short)((s_chan[ch].pLoop-spuMemC)>>3);
+       return (unsigned short)((s_chan[ch].pLoop-spu.spuMemC)>>3);
       }
     }
   }
@@ -323,25 +323,22 @@ unsigned short CALLBACK SPUreadRegister(unsigned long reg)
  switch(r)
   {
     case H_SPUctrl:
-     return spuCtrl;
+     return spu.spuCtrl;
 
     case H_SPUstat:
-     return spuStat;
+     return spu.spuStat;
         
     case H_SPUaddr:
-     return (unsigned short)(spuAddr>>3);
+     return (unsigned short)(spu.spuAddr>>3);
 
     case H_SPUdata:
      {
-      unsigned short s=spuMem[spuAddr>>1];
-      spuAddr+=2;
-      if(spuAddr>0x7ffff) spuAddr=0;
+      unsigned short s=spu.spuMem[spu.spuAddr>>1];
+      spu.spuAddr+=2;
+      if(spu.spuAddr>0x7ffff) spu.spuAddr=0;
       return s;
      }
 
-    case H_SPUirqAddr:
-     return spuIrq;
-
     //case H_SPUIsOn1:
     // return IsSoundOn(0,16);
 
@@ -350,7 +347,7 @@ unsigned short CALLBACK SPUreadRegister(unsigned long reg)
  
   }
 
- return regArea[(r-0xc00)>>1];
+ return spu.regArea[(r-0xc00)>>1];
 }
  
 ////////////////////////////////////////////////////////////////////////
@@ -368,13 +365,13 @@ static void SoundOn(int start,int end,unsigned short val)
      // do this here, not in StartSound
      // - fixes fussy timing issues
      s_chan[ch].bStop=0;
-     s_chan[ch].pCurr=spuMemC+((regAreaGet(ch,6)&~1)<<3); // must be block aligned
-     s_chan[ch].pLoop=spuMemC+((regAreaGet(ch,14)&~1)<<3);
+     s_chan[ch].pCurr=spu.spuMemC+((regAreaGet(ch,6)&~1)<<3); // must be block aligned
+     s_chan[ch].pLoop=spu.spuMemC+((regAreaGet(ch,14)&~1)<<3);
      s_chan[ch].prevflags=2;
 
-     dwNewChannel|=(1<<ch);                            // bitfield for faster testing
-     dwChannelOn|=1<<ch;
-     dwChannelDead&=~(1<<ch);
+     spu.dwNewChannel|=(1<<ch);
+     spu.dwChannelOn|=1<<ch;
+     spu.dwChannelDead&=~(1<<ch);
     }
   }
 }
@@ -394,7 +391,7 @@ static void SoundOff(int start,int end,unsigned short val)
 
      // Jungle Book - Rhythm 'n Groove
      // - turns off buzzing sound (loop hangs)
-     dwNewChannel &= ~(1<<ch);
+     spu.dwNewChannel &= ~(1<<ch);
     }                                                  
   }
 }
@@ -508,7 +505,7 @@ static void SetPitch(int ch,unsigned short val)               // SET PITCH
  s_chan[ch].iRawPitch=NP;
  s_chan[ch].sinc=(NP<<4)|8;
  s_chan[ch].sinc_inv=0;
- if(iUseInterpolation==1) s_chan[ch].SB[32]=1;         // -> freq change in simple interpolation mode: set flag
+ if(spu_config.iUseInterpolation==1) s_chan[ch].SB[32]=1; // -> freq change in simple interpolation mode: set flag
 }
 
 ////////////////////////////////////////////////////////////////////////
diff --git a/plugins/dfsound/reverb.c b/plugins/dfsound/reverb.c
index 0a94ff4a..bb5ee8e9 100644
--- a/plugins/dfsound/reverb.c
+++ b/plugins/dfsound/reverb.c
@@ -26,25 +26,15 @@
 // will be included from spu.c
 #ifdef _IN_SPU
 
-////////////////////////////////////////////////////////////////////////
-// globals
-////////////////////////////////////////////////////////////////////////
-
-// REVERB info and timing vars...
-
-int *          sRVBPlay      = 0;
-int *          sRVBEnd       = 0;
-int *          sRVBStart     = 0;
-
 ////////////////////////////////////////////////////////////////////////
 // START REVERB
 ////////////////////////////////////////////////////////////////////////
 
 INLINE void StartREVERB(int ch)
 {
- if(s_chan[ch].bReverb && (spuCtrl&0x80))              // reverb possible?
+ if(s_chan[ch].bReverb && (spu.spuCtrl&0x80))          // reverb possible?
   {
-   s_chan[ch].bRVBActive=!!iUseReverb;
+   s_chan[ch].bRVBActive=!!spu_config.iUseReverb;
   }
  else s_chan[ch].bRVBActive=0;                         // else -> no reverb
 }
@@ -55,7 +45,7 @@ INLINE void StartREVERB(int ch)
 
 INLINE void InitREVERB(int ns_to)
 {
- memset(sRVBStart,0,ns_to*sizeof(sRVBStart[0])*2);
+ memset(spu.sRVBStart,0,ns_to*sizeof(spu.sRVBStart[0])*2);
 }
 
 ////////////////////////////////////////////////////////////////////////
@@ -69,16 +59,16 @@ INLINE int rvb2ram_offs(int curr, int space, int iOff)
 
 // get_buffer content helper: takes care about wraps
 #define g_buffer(var) \
- ((int)(signed short)spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var)])
+ ((int)(signed short)spu.spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var)])
 
 // saturate iVal and store it as var
 #define s_buffer(var, iVal) \
  ssat32_to_16(iVal); \
- spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var)] = iVal
+ spu.spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var)] = iVal
 
 #define s_buffer1(var, iVal) \
  ssat32_to_16(iVal); \
- spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var + 1)] = iVal
+ spu.spuMem[rvb2ram_offs(curr_addr, space, rvb.n##var + 1)] = iVal
 
 ////////////////////////////////////////////////////////////////////////
 
@@ -97,8 +87,8 @@ static void MixREVERB(int ns_to)
    int ACC0, ACC1, FB_A0, FB_A1, FB_B0, FB_B1;
    int mix_dest_a0, mix_dest_a1, mix_dest_b0, mix_dest_b1;
 
-   int input_L = sRVBStart[ns]   * rvb.IN_COEF_L;
-   int input_R = sRVBStart[ns+1] * rvb.IN_COEF_R;
+   int input_L = spu.sRVBStart[ns]   * rvb.IN_COEF_L;
+   int input_R = spu.sRVBStart[ns+1] * rvb.IN_COEF_R;
 
    int IIR_INPUT_A0 = ((g_buffer(IIR_SRC_A0) * rvb.IIR_COEF) + input_L) >> 15;
    int IIR_INPUT_A1 = ((g_buffer(IIR_SRC_A1) * rvb.IIR_COEF) + input_R) >> 15;
@@ -254,7 +244,7 @@ INLINE void REVERBDo(int ns_to)
   return;
  }
 
- if (spuCtrl & 0x80)                                   // -> reverb on? oki
+ if (spu.spuCtrl & 0x80)                               // -> reverb on? oki
  {
   if (unlikely(rvb.dirty))
    prepare_offsets();
diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c
index d2eed13f..ca362b7f 100644
--- a/plugins/dfsound/spu.c
+++ b/plugins/dfsound/spu.c
@@ -26,6 +26,7 @@
 #include "registers.h"
 #include "out.h"
 #include "arm_features.h"
+#include "spu_config.h"
 
 #ifdef ENABLE_NLS
 #include <libintl.h>
@@ -72,45 +73,14 @@ static char * libraryInfo     = N_("P.E.Op.S. Sound Driver V1.7\nCoded by Pete B
 
 // globals
 
-// psx buffer / addresses
-
-unsigned short  regArea[10000];
-unsigned short  spuMem[256*1024];
-unsigned char * spuMemC;
-unsigned char * pSpuIrq=0;
-unsigned char * pSpuBuffer;
-
-// user settings
-
-int             iVolume=768; // 1024 is 1.0
-int             iXAPitch=1;
-int             iUseReverb=2;
-int             iUseInterpolation=2;
+SPUInfo         spu;
+SPUConfig       spu_config;
 
 // MAIN infos struct for each channel
 
 SPUCHAN         s_chan[MAXCHAN+1];                     // channel + 1 infos (1 is security for fmod handling)
 REVERBInfo      rvb;
 
-unsigned int    dwNoiseVal;                            // global noise generator
-unsigned int    dwNoiseCount;
-
-unsigned short  spuCtrl=0;                             // some vars to store psx reg infos
-unsigned short  spuStat=0;
-unsigned short  spuIrq=0;
-unsigned long   spuAddr=0xffffffff;                    // address into spu mem
-int             bSpuInit=0;
-int             bSPUIsOpen=0;
-
-unsigned int dwNewChannel=0;                           // flags for faster testing, if new channel starts
-unsigned int dwChannelOn=0;                            // not silent channels
-unsigned int dwPendingChanOff=0;
-unsigned int dwChannelDead=0;                          // silent+not useful channels
-
-void (CALLBACK *irqCallback)(void)=0;                  // func of main emu, called on spu irq
-void (CALLBACK *cddavCallback)(unsigned short,unsigned short)=0;
-void (CALLBACK *scheduleCallback)(unsigned int)=0;
-
 // certain globals (were local before, but with the new timeproc I need em global)
 
 static const int f[8][2] = {   {    0,  0  },
@@ -118,14 +88,9 @@ static const int f[8][2] = {   {    0,  0  },
                         {  115, -52 },
                         {   98, -55 },
                         {  122, -60 } };
-int ChanBuf[NSSIZE+3];
-int SSumLR[(NSSIZE+3)*2];
+int ChanBuf[NSSIZE];
+int SSumLR[NSSIZE*2];
 int iFMod[NSSIZE];
-short * pS;
-
-static int decode_dirty_ch;
-int decode_pos;
-unsigned int cycles_played;
 
 #define CDDA_BUFFER_SIZE (16384 * sizeof(uint32_t)) // must be power of 2
 
@@ -243,7 +208,7 @@ INLINE void InterpolateDown(int ch)
 ////////////////////////////////////////////////////////////////////////
 // helpers for gauss interpolation
 
-#define gval0 (((short*)(&s_chan[ch].SB[29]))[gpos])
+#define gval0 (((short*)(&s_chan[ch].SB[29]))[gpos&3])
 #define gval(x) ((int)((short*)(&s_chan[ch].SB[29]))[(gpos+x)&3])
 
 #include "gauss_i.h"
@@ -254,18 +219,18 @@ INLINE void InterpolateDown(int ch)
 
 static void do_irq(void)
 {
- //if(!(spuStat & STAT_IRQ))
+ //if(!(spu.spuStat & STAT_IRQ))
  {
-  spuStat |= STAT_IRQ;                                 // asserted status?
-  if(irqCallback) irqCallback();
+  spu.spuStat |= STAT_IRQ;                             // asserted status?
+  if(spu.irqCallback) spu.irqCallback();
  }
 }
 
 static int check_irq(int ch, unsigned char *pos)
 {
- if((spuCtrl & CTRL_IRQ) && pos == pSpuIrq)
+ if((spu.spuCtrl & CTRL_IRQ) && pos == spu.pSpuIrq)
  {
-  //printf("ch%d irq %04x\n", ch, pos - spuMemC);
+  //printf("ch%d irq %04x\n", ch, pos - spu.spuMemC);
   do_irq();
   return 1;
  }
@@ -293,11 +258,11 @@ INLINE void StartSound(int ch)
  s_chan[ch].SB[29]=0;                                  // init our interpolation helpers
  s_chan[ch].SB[30]=0;
 
- if(iUseInterpolation>=2)                              // gauss interpolation?
+ if(spu_config.iUseInterpolation>=2)                   // gauss interpolation?
       {s_chan[ch].spos=0x30000L;s_chan[ch].SB[28]=0;}  // -> start with more decoding
  else {s_chan[ch].spos=0x10000L;s_chan[ch].SB[31]=0;}  // -> no/simple interpolation starts with one 44100 decoding
 
- dwNewChannel&=~(1<<ch);                               // clear new channel bit
+ spu.dwNewChannel&=~(1<<ch);                           // clear new channel bit
 }
 
 ////////////////////////////////////////////////////////////////////////
@@ -315,7 +280,7 @@ INLINE int FModChangeFrequency(int ch,int ns)
  if(NP<0x1)    NP=0x1;
 
  sinc=NP<<4;                                           // calc frequency
- if(iUseInterpolation==1)                              // freq change in simple interpolation mode
+ if(spu_config.iUseInterpolation==1)                   // freq change in simple interpolation mode
   s_chan[ch].SB[32]=1;
  iFMod[ns]=0;
 
@@ -332,7 +297,7 @@ INLINE void StoreInterpolationVal(int ch,int fa)
   {
    ssat32_to_16(fa);
 
-   if(iUseInterpolation>=2)                            // gauss/cubic interpolation
+   if(spu_config.iUseInterpolation>=2)                 // gauss/cubic interpolation
     {     
      int gpos = s_chan[ch].SB[28];
      gval0 = fa;          
@@ -340,7 +305,7 @@ INLINE void StoreInterpolationVal(int ch,int fa)
      s_chan[ch].SB[28] = gpos;
     }
    else
-   if(iUseInterpolation==1)                            // simple interpolation
+   if(spu_config.iUseInterpolation==1)                 // simple interpolation
     {
      s_chan[ch].SB[28] = 0;                    
      s_chan[ch].SB[29] = s_chan[ch].SB[30];            // -> helpers for simple linear interpolation: delay real val for two slots, and calc the two deltas, for a 'look at the future behaviour'
@@ -360,7 +325,7 @@ INLINE int iGetInterpolationVal(int ch, int spos)
 
  if(s_chan[ch].bFMod==2) return s_chan[ch].SB[29];
 
- switch(iUseInterpolation)
+ switch(spu_config.iUseInterpolation)
   {   
    //--------------------------------------------------//
    case 3:                                             // cubic interpolation
@@ -448,7 +413,7 @@ static int decode_block(int ch)
  int ret = 0;
 
  start = s_chan[ch].pCurr;                 // set up the current pos
- if(start == spuMemC)                      // ?
+ if(start == spu.spuMemC)                  // ?
   stop = 1;
 
  if(s_chan[ch].prevflags&1)                // 1: stop/loop
@@ -463,7 +428,7 @@ static int decode_block(int ch)
 
  if(stop)
  {
-  dwChannelOn &= ~(1<<ch);                 // -> turn everything off
+  spu.dwChannelOn &= ~(1<<ch);             // -> turn everything off
   s_chan[ch].bStop = 1;
   s_chan[ch].ADSRX.EnvelopeVol = 0;
  }
@@ -485,8 +450,8 @@ static int decode_block(int ch)
   ret |= check_irq(ch, start);             // hack.. :(
  }
 
- if (start - spuMemC >= 0x80000)
-  start = spuMemC;
+ if (start - spu.spuMemC >= 0x80000)
+  start = spu.spuMemC;
 
  s_chan[ch].pCurr = start;                 // store values for next cycle
  s_chan[ch].prevflags = flags;
@@ -533,13 +498,13 @@ static void scan_for_irq(int ch, unsigned int *upd_samples)
  pos += (28 - s_chan[ch].iSBPos) << 16;
  while (pos < end)
  {
-  if (block == pSpuIrq)
+  if (block == spu.pSpuIrq)
    break;
   flags = block[1];
   block += 16;
   if (flags & 1) {                          // 1: stop/loop
    block = s_chan[ch].pLoop;
-   if (block == pSpuIrq)                    // hack.. (see decode_block)
+   if (block == spu.pSpuIrq)                // hack.. (see decode_block)
     break;
   }
   pos += 28 << 16;
@@ -640,23 +605,23 @@ static noinline int do_samples_noise(int ch, int ns, int ns_to)
  }
 
  // modified from DrHell/shalma, no fraction
- level = (spuCtrl >> 10) & 0x0f;
+ level = (spu.spuCtrl >> 10) & 0x0f;
  level = 0x8000 >> level;
 
  for (; ns < ns_to; ns++)
  {
-  dwNoiseCount += 2;
-  if (dwNoiseCount >= level)
+  spu.dwNoiseCount += 2;
+  if (spu.dwNoiseCount >= level)
   {
-   dwNoiseCount -= level;
-   shift = (dwNoiseVal >> 10) & 0x1f;
+   spu.dwNoiseCount -= level;
+   shift = (spu.dwNoiseVal >> 10) & 0x1f;
    bit = (0x69696969 >> shift) & 1;
-   if (dwNoiseVal & 0x8000)
+   if (spu.dwNoiseVal & 0x8000)
     bit ^= 1;
-   dwNoiseVal = (dwNoiseVal << 1) | bit;
+   spu.dwNoiseVal = (spu.dwNoiseVal << 1) | bit;
   }
 
-  ChanBuf[ns] = (signed short)dwNoiseVal;
+  ChanBuf[ns] = (signed short)spu.dwNoiseVal;
  }
 
  return ret;
@@ -665,7 +630,7 @@ static noinline int do_samples_noise(int ch, int ns, int ns_to)
 #ifdef HAVE_ARMV5
 // asm code; lv and rv must be 0-3fff
 extern void mix_chan(int start, int count, int lv, int rv);
-extern void mix_chan_rvb(int start, int count, int lv, int rv);
+extern void mix_chan_rvb(int start, int count, int lv, int rv, int *rvb);
 #else
 static void mix_chan(int start, int count, int lv, int rv)
 {
@@ -684,10 +649,10 @@ static void mix_chan(int start, int count, int lv, int rv)
   }
 }
 
-static void mix_chan_rvb(int start, int count, int lv, int rv)
+static void mix_chan_rvb(int start, int count, int lv, int rv, int *rvb)
 {
  int *dst = SSumLR + start * 2;
- int *drvb = sRVBStart + start * 2;
+ int *drvb = rvb + start * 2;
  const int *src = ChanBuf + start;
  int l, r;
 
@@ -710,8 +675,8 @@ static void mix_chan_rvb(int start, int count, int lv, int rv)
 static noinline void do_decode_bufs(int which, int start, int count)
 {
  const int *src = ChanBuf + start;
- unsigned short *dst = &spuMem[0x800/2 + which*0x400/2];
- int cursor = decode_pos + start;
+ unsigned short *dst = &spu.spuMem[0x800/2 + which*0x400/2];
+ int cursor = spu.decode_pos + start;
 
  while (count-- > 0)
   {
@@ -733,15 +698,15 @@ void do_samples(unsigned int cycles_to)
 {
  const int ns_from = 0;
  int ns,ns_to,ns_len;
- int volmult = iVolume;
+ int volmult = spu_config.iVolume;
  int ch,d,silentch;
  int cycle_diff;
 
- cycle_diff = cycles_to - cycles_played;
+ cycle_diff = cycles_to - spu.cycles_played;
  if (cycle_diff < -2*1048576 || cycle_diff > 2*1048576)
   {
    //xprintf("desync %u %d\n", cycles_to, cycle_diff);
-   cycles_played = cycles_to;
+   spu.cycles_played = cycles_to;
    return;
   }
 
@@ -772,13 +737,14 @@ void do_samples(unsigned int cycles_to)
   // (or 0x400 offsets of this pointer) hits the spuirq address, we generate
   // an IRQ.
 
-  if (unlikely((spuCtrl & CTRL_IRQ) && pSpuIrq && pSpuIrq < spuMemC+0x1000))
+  if (unlikely((spu.spuCtrl & CTRL_IRQ)
+      && spu.pSpuIrq && spu.pSpuIrq < spu.spuMemC+0x1000))
    {
-    int irq_pos = (pSpuIrq - spuMemC) / 2 & 0x1ff;
-    int left = (irq_pos - decode_pos) & 0x1ff;
+    int irq_pos = (spu.pSpuIrq - spu.spuMemC) / 2 & 0x1ff;
+    int left = (irq_pos - spu.decode_pos) & 0x1ff;
     if (0 < left && left <= ns_to)
      {
-      //xprintf("decoder irq %x\n", decode_pos);
+      //xprintf("decoder irq %x\n", spu.decode_pos);
       do_irq();
      }
    }
@@ -786,7 +752,7 @@ void do_samples(unsigned int cycles_to)
   InitREVERB(ns_to);
 
   {
-   silentch=~(dwChannelOn|dwNewChannel);
+   silentch=~(spu.dwChannelOn|spu.dwNewChannel);
 
    //--------------------------------------------------//
    //- main channel loop                              -// 
@@ -794,14 +760,14 @@ void do_samples(unsigned int cycles_to)
     {
      for(ch=0;ch<MAXCHAN;ch++)                         // loop em all...
       {
-       if(dwNewChannel&(1<<ch)) StartSound(ch);        // start new sound
-       if(!(dwChannelOn&(1<<ch))) continue;            // channel not playing? next
+       if(spu.dwNewChannel&(1<<ch)) StartSound(ch);    // start new sound
+       if(!(spu.dwChannelOn&(1<<ch))) continue;        // channel not playing? next
 
        if(s_chan[ch].bNoise)
         do_samples_noise(ch, ns_from, ns_to);
-       else if(s_chan[ch].bFMod==2 || (s_chan[ch].bFMod==0 && iUseInterpolation==0))
+       else if(s_chan[ch].bFMod==2 || (s_chan[ch].bFMod==0 && spu_config.iUseInterpolation==0))
         do_samples_noint(ch, ns_from, ns_to);
-       else if(s_chan[ch].bFMod==0 && iUseInterpolation==1)
+       else if(s_chan[ch].bFMod==0 && spu_config.iUseInterpolation==1)
         do_samples_simple(ch, ns_from, ns_to);
        else
         do_samples_default(ch, ns_from, ns_to);
@@ -813,13 +779,13 @@ void do_samples(unsigned int cycles_to)
        if(ch==1 || ch==3)
         {
          do_decode_bufs(ch/2, ns_from, ns_len);
-         decode_dirty_ch |= 1<<ch;
+         spu.decode_dirty_ch |= 1<<ch;
         }
 
        if(s_chan[ch].bFMod==2)                         // fmod freq channel
         memcpy(&iFMod[ns_from], &ChanBuf[ns_from], ns_len * sizeof(iFMod[0]));
        if(s_chan[ch].bRVBActive)
-        mix_chan_rvb(ns_from, ns_len, s_chan[ch].iLeftVolume, s_chan[ch].iRightVolume);
+        mix_chan_rvb(ns_from, ns_len, s_chan[ch].iLeftVolume, s_chan[ch].iRightVolume, spu.sRVBStart);
        else
         mix_chan(ns_from, ns_len, s_chan[ch].iLeftVolume, s_chan[ch].iRightVolume);
       }
@@ -827,12 +793,12 @@ void do_samples(unsigned int cycles_to)
 
     // advance "stopped" channels that can cause irqs
     // (all chans are always playing on the real thing..)
-    if(spuCtrl&CTRL_IRQ)
+    if(spu.spuCtrl&CTRL_IRQ)
      for(ch=0;ch<MAXCHAN;ch++)
       {
        if(!(silentch&(1<<ch))) continue;               // already handled
-       if(dwChannelDead&(1<<ch)) continue;
-       if(s_chan[ch].pCurr > pSpuIrq && s_chan[ch].pLoop > pSpuIrq)
+       if(spu.dwChannelDead&(1<<ch)) continue;
+       if(s_chan[ch].pCurr > spu.pSpuIrq && s_chan[ch].pLoop > spu.pSpuIrq)
         continue;
 
        s_chan[ch].spos += s_chan[ch].sinc * (ns_to - ns_from);
@@ -841,10 +807,10 @@ void do_samples(unsigned int cycles_to)
          unsigned char *start = s_chan[ch].pCurr;
 
          skip_block(ch);
-         if(start == s_chan[ch].pCurr || start - spuMemC < 0x1000)
+         if(start == s_chan[ch].pCurr || start - spu.spuMemC < 0x1000)
           {
            // looping on self or stopped(?)
-           dwChannelDead |= 1<<ch;
+           spu.dwChannelDead |= 1<<ch;
            s_chan[ch].spos = 0;
            break;
           }
@@ -853,19 +819,17 @@ void do_samples(unsigned int cycles_to)
         }
       }
 
-  if(unlikely(silentch & decode_dirty_ch & (1<<1)))    // must clear silent channel decode buffers
+  if(unlikely(silentch & spu.decode_dirty_ch & (1<<1))) // must clear silent channel decode buffers
    {
-    memset(&spuMem[0x800/2], 0, 0x400);
-    decode_dirty_ch &= ~(1<<1);
+    memset(&spu.spuMem[0x800/2], 0, 0x400);
+    spu.decode_dirty_ch &= ~(1<<1);
    }
-  if(unlikely(silentch & decode_dirty_ch & (1<<3)))
+  if(unlikely(silentch & spu.decode_dirty_ch & (1<<3)))
    {
-    memset(&spuMem[0xc00/2], 0, 0x400);
-    decode_dirty_ch &= ~(1<<3);
+    memset(&spu.spuMem[0xc00/2], 0, 0x400);
+    spu.decode_dirty_ch &= ~(1<<3);
    }
 
-  //---------------------------------------------------//
-  //- here we have another 1 ms of sound data
   //---------------------------------------------------//
   // mix XA infos (if any)
 
@@ -874,13 +838,13 @@ void do_samples(unsigned int cycles_to)
   ///////////////////////////////////////////////////////
   // mix all channels (including reverb) into one buffer
 
-  if(iUseReverb)
+  if(spu_config.iUseReverb)
    REVERBDo(ns_to);
 
-  if((spuCtrl&0x4000)==0) // muted? (rare, don't optimize for this)
+  if((spu.spuCtrl&0x4000)==0) // muted? (rare, don't optimize for this)
    {
-    memset(pS, 0, ns_to * 2 * sizeof(pS[0]));
-    pS += ns_to * 2;
+    memset(spu.pS, 0, ns_to * 2 * sizeof(spu.pS[0]));
+    spu.pS += ns_to * 2;
    }
   else
   for (ns = 0; ns < ns_to * 2; )
@@ -888,19 +852,19 @@ void do_samples(unsigned int cycles_to)
     d = SSumLR[ns]; SSumLR[ns] = 0;
     d = d * volmult >> 10;
     ssat32_to_16(d);
-    *pS++ = d;
+    *spu.pS++ = d;
     ns++;
 
     d = SSumLR[ns]; SSumLR[ns] = 0;
     d = d * volmult >> 10;
     ssat32_to_16(d);
-    *pS++ = d;
+    *spu.pS++ = d;
     ns++;
    }
 
-  cycles_played += ns_to * 768;
+  spu.cycles_played += ns_to * 768;
 
-  decode_pos = (decode_pos + ns_to) & 0x1ff;
+  spu.decode_pos = (spu.decode_pos + ns_to) & 0x1ff;
  }
 }
 
@@ -909,34 +873,34 @@ void schedule_next_irq(void)
  unsigned int upd_samples;
  int ch;
 
- if (scheduleCallback == NULL)
+ if (spu.scheduleCallback == NULL)
   return;
 
  upd_samples = 44100 / 50;
 
  for (ch = 0; ch < MAXCHAN; ch++)
  {
-  if (dwChannelDead & (1 << ch))
+  if (spu.dwChannelDead & (1 << ch))
    continue;
-  if ((unsigned long)(pSpuIrq - s_chan[ch].pCurr) > IRQ_NEAR_BLOCKS * 16
-    && (unsigned long)(pSpuIrq - s_chan[ch].pLoop) > IRQ_NEAR_BLOCKS * 16)
+  if ((unsigned long)(spu.pSpuIrq - s_chan[ch].pCurr) > IRQ_NEAR_BLOCKS * 16
+    && (unsigned long)(spu.pSpuIrq - s_chan[ch].pLoop) > IRQ_NEAR_BLOCKS * 16)
    continue;
 
   scan_for_irq(ch, &upd_samples);
  }
 
- if (unlikely(pSpuIrq < spuMemC + 0x1000))
+ if (unlikely(spu.pSpuIrq < spu.spuMemC + 0x1000))
  {
-  int irq_pos = (pSpuIrq - spuMemC) / 2 & 0x1ff;
-  int left = (irq_pos - decode_pos) & 0x1ff;
+  int irq_pos = (spu.pSpuIrq - spu.spuMemC) / 2 & 0x1ff;
+  int left = (irq_pos - spu.decode_pos) & 0x1ff;
   if (0 < left && left < upd_samples) {
-   //xprintf("decode: %3d (%3d/%3d)\n", left, decode_pos, irq_pos);
+   //xprintf("decode: %3d (%3d/%3d)\n", left, spu.decode_pos, irq_pos);
    upd_samples = left;
   }
  }
 
  if (upd_samples < 44100 / 50)
-  scheduleCallback(upd_samples * 768);
+  spu.scheduleCallback(upd_samples * 768);
 }
 
 // SPU ASYNC... even newer epsxe func
@@ -948,18 +912,18 @@ void CALLBACK SPUasync(unsigned int cycle, unsigned int flags)
 {
  do_samples(cycle);
 
- if (spuCtrl & CTRL_IRQ)
+ if (spu.spuCtrl & CTRL_IRQ)
   schedule_next_irq();
 
  if (flags & 1) {
-  out_current->feed(pSpuBuffer, (unsigned char *)pS - pSpuBuffer);
-  pS = (short *)pSpuBuffer;
+  out_current->feed(spu.pSpuBuffer, (unsigned char *)spu.pS - spu.pSpuBuffer);
+  spu.pS = (short *)spu.pSpuBuffer;
 
-  if (0) {
+  if (spu_config.iTempo) {
    if (!out_current->busy())
     // cause more samples to be generated
     // (and break some games because of bad sync)
-    cycles_played -= 44100 / 60 / 2 * 768;
+    spu.cycles_played -= 44100 / 60 / 2 * 768;
   }
  }
 }
@@ -1001,7 +965,7 @@ void ClearWorkingState(void)
 {
  memset(SSumLR,0,sizeof(SSumLR));                      // init some mixing buffers
  memset(iFMod,0,sizeof(iFMod));     
- pS=(short *)pSpuBuffer;                               // setup soundbuffer pointer
+ spu.pS=(short *)spu.pSpuBuffer;                       // setup soundbuffer pointer
 }
 
 // SETUPSTREAMS: init most of the spu buffers
@@ -1009,55 +973,46 @@ void SetupStreams(void)
 { 
  int i;
 
- pSpuBuffer=(unsigned char *)malloc(32768);            // alloc mixing buffer
+ spu.pSpuBuffer = (unsigned char *)malloc(32768);      // alloc mixing buffer
+ spu.sRVBStart = (int *)malloc(NSSIZE*2*4);            // alloc reverb buffer
+ memset(spu.sRVBStart,0,NSSIZE*2*4);
 
- if(iUseReverb==1) i=88200*2;
- else              i=NSSIZE*2;
-
- sRVBStart = (int *)malloc(i*4);                       // alloc reverb buffer
- memset(sRVBStart,0,i*4);
- sRVBEnd  = sRVBStart + i;
- sRVBPlay = sRVBStart;
-
- XAStart =                                             // alloc xa buffer
+ spu.XAStart =                                         // alloc xa buffer
   (uint32_t *)malloc(44100 * sizeof(uint32_t));
- XAEnd   = XAStart + 44100;
- XAPlay  = XAStart;
- XAFeed  = XAStart;
+ spu.XAEnd   = spu.XAStart + 44100;
+ spu.XAPlay  = spu.XAStart;
+ spu.XAFeed  = spu.XAStart;
 
- CDDAStart =                                           // alloc cdda buffer
+ spu.CDDAStart =                                       // alloc cdda buffer
   (uint32_t *)malloc(CDDA_BUFFER_SIZE);
- CDDAEnd   = CDDAStart + 16384;
- CDDAPlay  = CDDAStart;
- CDDAFeed  = CDDAStart;
+ spu.CDDAEnd   = spu.CDDAStart + 16384;
+ spu.CDDAPlay  = spu.CDDAStart;
+ spu.CDDAFeed  = spu.CDDAStart;
 
  for(i=0;i<MAXCHAN;i++)                                // loop sound channels
   {
-// we don't use mutex sync... not needed, would only 
-// slow us down:
-//   s_chan[i].hMutex=CreateMutex(NULL,FALSE,NULL);
    s_chan[i].ADSRX.SustainLevel = 0xf;                 // -> init sustain
    s_chan[i].ADSRX.SustainIncrease = 1;
-   s_chan[i].pLoop=spuMemC;
-   s_chan[i].pCurr=spuMemC;
+   s_chan[i].pLoop=spu.spuMemC;
+   s_chan[i].pCurr=spu.spuMemC;
   }
 
  ClearWorkingState();
 
- bSpuInit=1;                                           // flag: we are inited
+ spu.bSpuInit=1;                                       // flag: we are inited
 }
 
 // REMOVESTREAMS: free most buffer
 void RemoveStreams(void)
 { 
- free(pSpuBuffer);                                     // free mixing buffer
- pSpuBuffer = NULL;
- free(sRVBStart);                                      // free reverb buffer
- sRVBStart = NULL;
- free(XAStart);                                        // free XA buffer
- XAStart = NULL;
- free(CDDAStart);                                      // free CDDA buffer
- CDDAStart = NULL;
+ free(spu.pSpuBuffer);                                 // free mixing buffer
+ spu.pSpuBuffer = NULL;
+ free(spu.sRVBStart);                                  // free reverb buffer
+ spu.sRVBStart = NULL;
+ free(spu.XAStart);                                    // free XA buffer
+ spu.XAStart = NULL;
+ free(spu.CDDAStart);                                  // free CDDA buffer
+ spu.CDDAStart = NULL;
 }
 
 // INIT/EXIT STUFF
@@ -1065,30 +1020,31 @@ void RemoveStreams(void)
 // SPUINIT: this func will be called first by the main emu
 long CALLBACK SPUinit(void)
 {
- spuMemC = (unsigned char *)spuMem;                    // just small setup
+ spu.spuMemC = (unsigned char *)spu.spuMem;            // just small setup
  memset((void *)&rvb, 0, sizeof(REVERBInfo));
  InitADSR();
 
- spuIrq = 0;
- spuAddr = 0xffffffff;
- spuMemC = (unsigned char *)spuMem;
- decode_pos = 0;
- memset((void *)s_chan, 0, (MAXCHAN + 1) * sizeof(SPUCHAN));
- pSpuIrq = 0;
+ spu.spuAddr = 0xffffffff;
+ spu.decode_pos = 0;
+ memset((void *)s_chan, 0, sizeof(s_chan));
+ spu.pSpuIrq = 0;
 
  SetupStreams();                                       // prepare streaming
 
+ if (spu_config.iVolume == 0)
+  spu_config.iVolume = 768; // 1024 is 1.0
+
  return 0;
 }
 
 // SPUOPEN: called by main emu after init
 long CALLBACK SPUopen(void)
 {
- if (bSPUIsOpen) return 0;                             // security for some stupid main emus
+ if (spu.bSPUIsOpen) return 0;                         // security for some stupid main emus
 
  SetupSound();                                         // setup sound (before init!)
 
- bSPUIsOpen = 1;
+ spu.bSPUIsOpen = 1;
 
  return PSE_SPU_ERR_SUCCESS;
 }
@@ -1096,9 +1052,9 @@ long CALLBACK SPUopen(void)
 // SPUCLOSE: called before shutdown
 long CALLBACK SPUclose(void)
 {
- if (!bSPUIsOpen) return 0;                            // some security
+ if (!spu.bSPUIsOpen) return 0;                        // some security
 
- bSPUIsOpen = 0;                                       // no more open
+ spu.bSPUIsOpen = 0;                                   // no more open
 
  out_current->finish();                                // no more sound handling
 
@@ -1110,7 +1066,7 @@ long CALLBACK SPUshutdown(void)
 {
  SPUclose();
  RemoveStreams();                                      // no more streaming
- bSpuInit=0;
+ spu.bSpuInit=0;
 
  return 0;
 }
@@ -1147,17 +1103,17 @@ void CALLBACK SPUabout(void)
 // passes a callback that should be called on SPU-IRQ/cdda volume change
 void CALLBACK SPUregisterCallback(void (CALLBACK *callback)(void))
 {
- irqCallback = callback;
+ spu.irqCallback = callback;
 }
 
 void CALLBACK SPUregisterCDDAVolume(void (CALLBACK *CDDAVcallback)(unsigned short,unsigned short))
 {
- cddavCallback = CDDAVcallback;
+ spu.cddavCallback = CDDAVcallback;
 }
 
 void CALLBACK SPUregisterScheduleCb(void (CALLBACK *callback)(unsigned int))
 {
- scheduleCallback = callback;
+ spu.scheduleCallback = callback;
 }
 
 // COMMON PLUGIN INFO FUNCS
@@ -1190,18 +1146,18 @@ void spu_get_debug_info(int *chans_out, int *run_chans, int *fmod_chans_out, int
 
  for(;ch<MAXCHAN;ch++)
  {
-  if (!(dwChannelOn & (1<<ch)))
+  if (!(spu.dwChannelOn & (1<<ch)))
    continue;
   if (s_chan[ch].bFMod == 2)
    fmod_chans |= 1 << ch;
   if (s_chan[ch].bNoise)
    noise_chans |= 1 << ch;
-  if((spuCtrl&CTRL_IRQ) && s_chan[ch].pCurr <= pSpuIrq && s_chan[ch].pLoop <= pSpuIrq)
+  if((spu.spuCtrl&CTRL_IRQ) && s_chan[ch].pCurr <= spu.pSpuIrq && s_chan[ch].pLoop <= spu.pSpuIrq)
    irq_chans |= 1 << ch;
  }
 
- *chans_out = dwChannelOn;
- *run_chans = ~dwChannelOn & ~dwChannelDead & irq_chans;
+ *chans_out = spu.dwChannelOn;
+ *run_chans = ~spu.dwChannelOn & ~spu.dwChannelDead & irq_chans;
  *fmod_chans_out = fmod_chans;
  *noise_chans_out = noise_chans;
 }
diff --git a/plugins/dfsound/spu_config.h b/plugins/dfsound/spu_config.h
new file mode 100644
index 00000000..c6641be5
--- /dev/null
+++ b/plugins/dfsound/spu_config.h
@@ -0,0 +1,12 @@
+// user settings
+
+typedef struct
+{
+ int        iVolume;
+ int        iXAPitch;
+ int        iUseReverb;
+ int        iUseInterpolation;
+ int        iTempo;
+} SPUConfig;
+
+extern SPUConfig spu_config;
diff --git a/plugins/dfsound/xa.c b/plugins/dfsound/xa.c
index 4c016aad..704847b4 100644
--- a/plugins/dfsound/xa.c
+++ b/plugins/dfsound/xa.c
@@ -26,24 +26,6 @@
 // XA GLOBALS
 ////////////////////////////////////////////////////////////////////////
 
-xa_decode_t   * xapGlobal=0;
-
-uint32_t * XAFeed  = NULL;
-uint32_t * XAPlay  = NULL;
-uint32_t * XAStart = NULL;
-uint32_t * XAEnd   = NULL;
-
-uint32_t   XARepeat  = 0;
-uint32_t   XALastVal = 0;
-
-uint32_t * CDDAFeed  = NULL;
-uint32_t * CDDAPlay  = NULL;
-uint32_t * CDDAStart = NULL;
-uint32_t * CDDAEnd   = NULL;
-
-int             iLeftXAVol  = 32767;
-int             iRightXAVol = 32767;
-
 static int gauss_ptr = 0;
 static int gauss_window[8] = {0, 0, 0, 0, 0, 0, 0, 0};
 
@@ -61,43 +43,43 @@ INLINE void MixXA(int ns_to)
  int ns;
  short l, r;
  uint32_t v;
- int cursor = decode_pos;
+ int cursor = spu.decode_pos;
 
- if(XAPlay != XAFeed || XARepeat > 0)
+ if(spu.XAPlay != spu.XAFeed || spu.XARepeat > 0)
  {
-  if(XAPlay == XAFeed)
-   XARepeat--;
+  if(spu.XAPlay == spu.XAFeed)
+   spu.XARepeat--;
 
-  v = XALastVal;
+  v = spu.XALastVal;
   for(ns = 0; ns < ns_to*2; )
    {
-    if(XAPlay != XAFeed) v=*XAPlay++;
-    if(XAPlay == XAEnd) XAPlay=XAStart;
+    if(spu.XAPlay != spu.XAFeed) v=*spu.XAPlay++;
+    if(spu.XAPlay == spu.XAEnd) spu.XAPlay=spu.XAStart;
 
-    l = ((int)(short)v * iLeftXAVol) >> 15;
-    r = ((int)(short)(v >> 16) * iLeftXAVol) >> 15;
+    l = ((int)(short)v * spu.iLeftXAVol) >> 15;
+    r = ((int)(short)(v >> 16) * spu.iLeftXAVol) >> 15;
     SSumLR[ns++] += l;
     SSumLR[ns++] += r;
 
-    spuMem[cursor] = v;
-    spuMem[cursor + 0x400/2] = v >> 16;
+    spu.spuMem[cursor] = v;
+    spu.spuMem[cursor + 0x400/2] = v >> 16;
     cursor = (cursor + 1) & 0x1ff;
    }
-  XALastVal = v;
+  spu.XALastVal = v;
  }
 
- for(ns = 0; ns < ns_to * 2 && CDDAPlay!=CDDAFeed && (CDDAPlay!=CDDAEnd-1||CDDAFeed!=CDDAStart);)
+ for(ns = 0; ns < ns_to * 2 && spu.CDDAPlay!=spu.CDDAFeed && (spu.CDDAPlay!=spu.CDDAEnd-1||spu.CDDAFeed!=spu.CDDAStart);)
   {
-   v=*CDDAPlay++;
-   if(CDDAPlay==CDDAEnd) CDDAPlay=CDDAStart;
+   v=*spu.CDDAPlay++;
+   if(spu.CDDAPlay==spu.CDDAEnd) spu.CDDAPlay=spu.CDDAStart;
 
-   l = ((int)(short)v * iLeftXAVol) >> 15;
-   r = ((int)(short)(v >> 16) * iLeftXAVol) >> 15;
+   l = ((int)(short)v * spu.iLeftXAVol) >> 15;
+   r = ((int)(short)(v >> 16) * spu.iLeftXAVol) >> 15;
    SSumLR[ns++] += l;
    SSumLR[ns++] += r;
 
-   spuMem[cursor] = v;
-   spuMem[cursor + 0x400/2] = v >> 16;
+   spu.spuMem[cursor] = v;
+   spu.spuMem[cursor + 0x400/2] = v >> 16;
    cursor = (cursor + 1) & 0x1ff;
   }
 }
@@ -121,10 +103,10 @@ INLINE void FeedXA(xa_decode_t *xap)
 {
  int sinc,spos,i,iSize,iPlace,vl,vr;
 
- if(!bSPUIsOpen) return;
+ if(!spu.bSPUIsOpen) return;
 
- xapGlobal = xap;                                      // store info for save states
- XARepeat  = 100;                                      // set up repeat
+ spu.xapGlobal = xap;                                  // store info for save states
+ spu.XARepeat  = 100;                                  // set up repeat
 
 #if 0//def XA_HACK
  iSize=((45500*xap->nsamples)/xap->freq);              // get size
@@ -133,13 +115,13 @@ INLINE void FeedXA(xa_decode_t *xap)
 #endif
  if(!iSize) return;                                    // none? bye
 
- if(XAFeed<XAPlay) iPlace=XAPlay-XAFeed;               // how much space in my buf?
- else              iPlace=(XAEnd-XAFeed) + (XAPlay-XAStart);
+ if(spu.XAFeed<spu.XAPlay) iPlace=spu.XAPlay-spu.XAFeed; // how much space in my buf?
+ else              iPlace=(spu.XAEnd-spu.XAFeed) + (spu.XAPlay-spu.XAStart);
 
  if(iPlace==0) return;                                 // no place at all
 
  //----------------------------------------------------//
- if(iXAPitch)                                          // pitch change option?
+ if(spu_config.iXAPitch)                               // pitch change option?
   {
    static DWORD dwLT=0;
    static DWORD dwFPS=0;
@@ -185,12 +167,12 @@ INLINE void FeedXA(xa_decode_t *xap)
    uint32_t * pS=(uint32_t *)xap->pcm;
    uint32_t l=0;
 
-   if(iXAPitch)
+   if(spu_config.iXAPitch)
     {
      int32_t l1,l2;short s;
      for(i=0;i<iSize;i++)
       {
-       if(iUseInterpolation==2) 
+       if(spu_config.iUseInterpolation==2)
         {
          while(spos>=0x10000L)
           {
@@ -231,12 +213,12 @@ INLINE void FeedXA(xa_decode_t *xap)
        ssat32_to_16(l2);
        l=(l1&0xffff)|(l2<<16);
 
-       *XAFeed++=l;
+       *spu.XAFeed++=l;
 
-       if(XAFeed==XAEnd) XAFeed=XAStart;
-       if(XAFeed==XAPlay) 
+       if(spu.XAFeed==spu.XAEnd) spu.XAFeed=spu.XAStart;
+       if(spu.XAFeed==spu.XAPlay)
         {
-         if(XAPlay!=XAStart) XAFeed=XAPlay-1;
+         if(spu.XAPlay!=spu.XAStart) spu.XAFeed=spu.XAPlay-1;
          break;
         }
 
@@ -247,7 +229,7 @@ INLINE void FeedXA(xa_decode_t *xap)
     {
      for(i=0;i<iSize;i++)
       {
-       if(iUseInterpolation==2) 
+       if(spu_config.iUseInterpolation==2)
         {
          while(spos>=0x10000L)
           {
@@ -278,12 +260,12 @@ INLINE void FeedXA(xa_decode_t *xap)
           }
         }
 
-       *XAFeed++=l;
+       *spu.XAFeed++=l;
 
-       if(XAFeed==XAEnd) XAFeed=XAStart;
-       if(XAFeed==XAPlay) 
+       if(spu.XAFeed==spu.XAEnd) spu.XAFeed=spu.XAStart;
+       if(spu.XAFeed==spu.XAPlay)
         {
-         if(XAPlay!=XAStart) XAFeed=XAPlay-1;
+         if(spu.XAPlay!=spu.XAStart) spu.XAFeed=spu.XAPlay-1;
          break;
         }
 
@@ -296,12 +278,12 @@ INLINE void FeedXA(xa_decode_t *xap)
    unsigned short * pS=(unsigned short *)xap->pcm;
    uint32_t l;short s=0;
 
-   if(iXAPitch)
+   if(spu_config.iXAPitch)
     {
      int32_t l1;
      for(i=0;i<iSize;i++)
       {
-       if(iUseInterpolation==2) 
+       if(spu_config.iUseInterpolation==2)
         {
          while(spos>=0x10000L)
           {
@@ -330,12 +312,12 @@ INLINE void FeedXA(xa_decode_t *xap)
        l1=(l1*iPlace)/iSize;
        ssat32_to_16(l1);
        l=(l1&0xffff)|(l1<<16);
-       *XAFeed++=l;
+       *spu.XAFeed++=l;
 
-       if(XAFeed==XAEnd) XAFeed=XAStart;
-       if(XAFeed==XAPlay) 
+       if(spu.XAFeed==spu.XAEnd) spu.XAFeed=spu.XAStart;
+       if(spu.XAFeed==spu.XAPlay)
         {
-         if(XAPlay!=XAStart) XAFeed=XAPlay-1;
+         if(spu.XAPlay!=spu.XAStart) spu.XAFeed=spu.XAPlay-1;
          break;
         }
 
@@ -346,7 +328,7 @@ INLINE void FeedXA(xa_decode_t *xap)
     {
      for(i=0;i<iSize;i++)
       {
-       if(iUseInterpolation==2) 
+       if(spu_config.iUseInterpolation==2)
         {
          while(spos>=0x10000L)
           {
@@ -372,12 +354,12 @@ INLINE void FeedXA(xa_decode_t *xap)
         }
 
        l &= 0xffff;
-       *XAFeed++=(l|(l<<16));
+       *spu.XAFeed++=(l|(l<<16));
 
-       if(XAFeed==XAEnd) XAFeed=XAStart;
-       if(XAFeed==XAPlay) 
+       if(spu.XAFeed==spu.XAEnd) spu.XAFeed=spu.XAStart;
+       if(spu.XAFeed==spu.XAPlay)
         {
-         if(XAPlay!=XAStart) XAFeed=XAPlay-1;
+         if(spu.XAPlay!=spu.XAStart) spu.XAFeed=spu.XAPlay-1;
          break;
         }
 
@@ -394,21 +376,21 @@ INLINE void FeedXA(xa_decode_t *xap)
 INLINE int FeedCDDA(unsigned char *pcm, int nBytes)
 {
  int space;
- space=(CDDAPlay-CDDAFeed-1)*4 & (CDDA_BUFFER_SIZE - 1);
+ space=(spu.CDDAPlay-spu.CDDAFeed-1)*4 & (CDDA_BUFFER_SIZE - 1);
  if(space<nBytes)
   return 0x7761; // rearmed_wait
 
  while(nBytes>0)
   {
-   if(CDDAFeed==CDDAEnd) CDDAFeed=CDDAStart;
-   space=(CDDAPlay-CDDAFeed-1)*4 & (CDDA_BUFFER_SIZE - 1);
-   if(CDDAFeed+space/4>CDDAEnd)
-    space=(CDDAEnd-CDDAFeed)*4;
+   if(spu.CDDAFeed==spu.CDDAEnd) spu.CDDAFeed=spu.CDDAStart;
+   space=(spu.CDDAPlay-spu.CDDAFeed-1)*4 & (CDDA_BUFFER_SIZE - 1);
+   if(spu.CDDAFeed+space/4>spu.CDDAEnd)
+    space=(spu.CDDAEnd-spu.CDDAFeed)*4;
    if(space>nBytes)
     space=nBytes;
 
-   memcpy(CDDAFeed,pcm,space);
-   CDDAFeed+=space/4;
+   memcpy(spu.CDDAFeed,pcm,space);
+   spu.CDDAFeed+=space/4;
    nBytes-=space;
    pcm+=space;
   }