spu: put globals into a structure

[pcsx_rearmed.git] / frontend / main.c

diff --git a/frontend/main.c b/frontend/main.c
index acebaae..426ef13 100644 (file)
--- 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;