From 63a4f6b6a3b0315590cd3009df2c92480ed2d98b Mon Sep 17 00:00:00 2001
From: notaz
Date: Fri, 2 Jan 2015 04:13:50 +0200
Subject: spu: threaded implementation

unlike original P.E.Op.S. implementation, the goal here is to carefully
avoid any side effects caused by having the thread enabled
---
 frontend/menu.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'frontend/menu.c')

diff --git a/frontend/menu.c b/frontend/menu.c
index a7012e6..a1edac2 100644
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -75,6 +75,7 @@ typedef enum
 	MA_OPT_SAVECFG,
 	MA_OPT_SAVECFG_GAME,
 	MA_OPT_CPU_CLOCKS,
+	MA_OPT_SPU_THREAD,
 	MA_OPT_DISP_OPTS,
 	MA_OPT_VARSCALER,
 	MA_OPT_VARSCALER_C,
@@ -444,6 +445,7 @@ static const struct {
 	CE_INTVAL(spu_config.iXAPitch),
 	CE_INTVAL(spu_config.iUseInterpolation),
 	CE_INTVAL(spu_config.iTempo),
+	CE_INTVAL(spu_config.iUseThread),
 	CE_INTVAL(config_save_counter),
 	CE_INTVAL(in_evdev_allow_abs_only),
 	CE_INTVAL(volume_boost),
@@ -1604,6 +1606,7 @@ static menu_entry e_menu_options[] =
 	mee_onoff     ("Show FPS",                 0, g_opts, OPT_SHOWFPS),
 	mee_enum      ("Region",                   0, region, men_region),
 	mee_range     ("CPU clock",                MA_OPT_CPU_CLOCKS, cpu_clock, 20, 5000),
+	mee_onoff     ("Threaded SPU",             MA_OPT_SPU_THREAD, spu_config.iUseThread, 1),
 	mee_handler_id("[Display]",                MA_OPT_DISP_OPTS, menu_loop_gfx_options),
 	mee_handler   ("[BIOS/Plugins]",           menu_loop_plugin_options),
 	mee_handler   ("[Advanced]",               menu_loop_adv_options),
-- 
cgit v1.2.3


From 8886a80857ea5329717a54f4deb37d8e974ffc9c Mon Sep 17 00:00:00 2001
From: notaz
Date: Sun, 11 Jan 2015 23:35:35 +0200
Subject: frontend: show C64x option

---
 frontend/menu.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'frontend/menu.c')

diff --git a/frontend/menu.c b/frontend/menu.c
index a1edac2..675ec26 100644
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -1606,7 +1606,11 @@ static menu_entry e_menu_options[] =
 	mee_onoff     ("Show FPS",                 0, g_opts, OPT_SHOWFPS),
 	mee_enum      ("Region",                   0, region, men_region),
 	mee_range     ("CPU clock",                MA_OPT_CPU_CLOCKS, cpu_clock, 20, 5000),
+#ifdef C64X_DSP
+	mee_onoff     ("Use C64x DSP for sound",   MA_OPT_SPU_THREAD, spu_config.iUseThread, 1),
+#else
 	mee_onoff     ("Threaded SPU",             MA_OPT_SPU_THREAD, spu_config.iUseThread, 1),
+#endif
 	mee_handler_id("[Display]",                MA_OPT_DISP_OPTS, menu_loop_gfx_options),
 	mee_handler   ("[BIOS/Plugins]",           menu_loop_plugin_options),
 	mee_handler   ("[Advanced]",               menu_loop_adv_options),
@@ -1619,10 +1623,9 @@ static menu_entry e_menu_options[] =
 static int menu_loop_options(int id, int keys)
 {
 	static int sel = 0;
-	int i;
 
-	i = me_id2offset(e_menu_options, MA_OPT_CPU_CLOCKS);
-	e_menu_options[i].enabled = cpu_clock_st > 0 ? 1 : 0;
+	me_enable(e_menu_options, MA_OPT_CPU_CLOCKS, cpu_clock_st > 0);
+	me_enable(e_menu_options, MA_OPT_SPU_THREAD, spu_config.iThreadAvail);
 	me_enable(e_menu_options, MA_OPT_SAVECFG_GAME, ready_to_go && CdromId[0]);
 
 	me_loop(e_menu_options, &sel);
-- 
cgit v1.2.3


From 52d279a54510d3c73c53462f3f236d62fec2d6fa Mon Sep 17 00:00:00 2001
From: notaz
Date: Mon, 12 Jan 2015 00:25:49 +0200
Subject: release r21

---
 frontend/menu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'frontend/menu.c')

diff --git a/frontend/menu.c b/frontend/menu.c
index 675ec26..0088a63 100644
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -1,5 +1,5 @@
 /*
- * (C) Gražvydas "notaz" Ignotas, 2010-2014
+ * (C) Gražvydas "notaz" Ignotas, 2010-2015
  *
  * This work is licensed under the terms of any of these licenses
  * (at your option):
@@ -1934,7 +1934,7 @@ static const char credits_text[] =
 	"PCSX4ALL plugin by PCSX4ALL team\n"
 	"  Chui, Franxis, Unai\n\n"
 	"integration, optimization and\n"
-	"  frontend (C) 2010-2014 notaz\n";
+	"  frontend (C) 2010-2015 notaz\n";
 
 static int reset_game(void)
 {
-- 
cgit v1.2.3