From cdb31c9557f464b452ce6dc78b58b7e73cd423d8 Mon Sep 17 00:00:00 2001
From: notaz <notasas@gmail.com>
Date: Tue, 8 Feb 2011 01:32:53 +0200
Subject: [PATCH] frontend: enable SPUIRQWait by default

---
 frontend/menu.c       | 13 +++++++++----
 plugins/dfsound/spu.c |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/frontend/menu.c b/frontend/menu.c
index d5c7d91a..77629059 100644
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -159,7 +159,8 @@ static void menu_set_defconfig(void)
 
 	iUseReverb = 2;
 	iUseInterpolation = 1;
-	iXAPitch = iSPUIRQWait = 0;
+	iXAPitch = 0;
+	iSPUIRQWait = 1;
 	iUseTimer = 2;
 
 	menu_sync_config();
@@ -177,6 +178,10 @@ static void menu_set_defconfig(void)
 #define CE_INTVAL(val) \
 	{ #val, sizeof(val), &val }
 
+// 'versioned' var, used when defaults change
+#define CE_INTVAL_V(val, ver) \
+	{ #val #ver, sizeof(val), &val }
+
 static const struct {
 	const char *name;
 	size_t len;
@@ -211,9 +216,9 @@ static const struct {
 	CE_INTVAL(UseFrameSkip),
 	CE_INTVAL(dwActFixes),
 	CE_INTVAL(iUseReverb),
-	CE_INTVAL(iUseInterpolation),
 	CE_INTVAL(iXAPitch),
-	CE_INTVAL(iSPUIRQWait),
+	CE_INTVAL_V(iUseInterpolation, 2),
+	CE_INTVAL_V(iSPUIRQWait, 2),
 	CE_INTVAL(iUseTimer),
 };
 
@@ -1026,7 +1031,7 @@ static int menu_loop_plugin_gpu(int id, int keys)
 
 static const char *men_spu_reverb[] = { "Off", "Fake", "On", NULL };
 static const char *men_spu_interp[] = { "None", "Simple", "Gaussian", "Cubic", NULL };
-static const char h_spu_irq_wait[]  = "Wait for CPU; only useful for some games, may cause glitches";
+static const char h_spu_irq_wait[]  = "Wait for CPU (recommended set to ON)";
 static const char h_spu_thread[]    = "Run sound emulation in main thread (recommended)";
 
 static menu_entry e_menu_plugin_spu[] =
diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c
index 084fccf0..c455d3d7 100644
--- a/plugins/dfsound/spu.c
+++ b/plugins/dfsound/spu.c
@@ -925,7 +925,7 @@ long CALLBACK SPUinit(void)
  pMixIrq = 0;
  memset((void *)s_chan, 0, (MAXCHAN + 1) * sizeof(SPUCHAN));
  pSpuIrq = 0;
- iSPUIRQWait = 0;
+ //iSPUIRQWait = 0;
  lastch = -1;
 
  //ReadConfigSPU();                                      // read user stuff
-- 
2.39.5