X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmenu.c;h=cfa3284830f9027ee20a56cb3ce646b647313deb;hp=b25e1927c2aab322d1e5ad5424cb06daa8bddfc7;hb=35d3fd2efb47352edf794255da3e4745f6bd0a0d;hpb=69e482e3def6669a4fa921d07f9ba04883d7de34

diff --git a/frontend/menu.c b/frontend/menu.c
index b25e1927..cfa32848 100644
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -26,6 +26,7 @@
 #include "plugin_lib.h"
 #include "plat.h"
 #include "pcnt.h"
+#include "cspace.h"
 #include "libpicofe/plat.h"
 #include "libpicofe/input.h"
 #include "libpicofe/linux/in_evdev.h"
@@ -36,7 +37,7 @@
 #include "../libpcsxcore/cheat.h"
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
 #include "../plugins/dfinput/externals.h"
-#include "../plugins/gpulib/cspace.h"
+#include "../plugins/dfsound/spu_config.h"
 #include "psemu_plugin_defs.h"
 #include "revision.h"
 
@@ -82,6 +83,8 @@ typedef enum
 	MA_OPT_SWFILTER,
 	MA_OPT_GAMMA,
 	MA_OPT_VOUT_MODE,
+	MA_OPT_SCANLINES,
+	MA_OPT_SCANLINE_LEVEL,
 } menu_id;
 
 static int last_vout_w, last_vout_h, last_vout_bpp;
@@ -89,8 +92,9 @@ static int cpu_clock, cpu_clock_st, volume_boost, frameskip;
 static char last_selected_fname[MAXPATHLEN];
 static int config_save_counter, region, in_type_sel1, in_type_sel2;
 static int psx_clock;
-static int memcard1_sel, memcard2_sel;
+static int memcard1_sel = -1, memcard2_sel = -1;
 int g_opts, g_scaler, g_gamma = 100;
+int scanlines, scanline_level = 20;
 int soft_scaling, analog_deadzone; // for Caanoo
 int soft_filter;
 
@@ -102,12 +106,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];
@@ -214,6 +212,9 @@ static int optional_cdimg_filter(struct dirent **namelist, int count,
 	struct stat64 statf;
 	FILE *f;
 
+	if (count <= 1)
+		return count;
+
 	for (i = 1; i < count; i++) {
 		if (namelist[i] == NULL || namelist[i]->d_type == DT_DIR)
 			continue;
@@ -318,7 +319,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);
 }
@@ -335,6 +336,8 @@ static void menu_set_defconfig(void)
 	analog_deadzone = 50;
 	soft_scaling = 1;
 	soft_filter = 0;
+	scanlines = 0;
+	scanline_level = 20;
 	plat_target.vout_fullscreen = 0;
 	psx_clock = DEFAULT_PSX_CLOCK;
 
@@ -393,13 +396,15 @@ static const struct {
 	CE_CONFIG_VAL(VSyncWA),
 	CE_CONFIG_VAL(Cpu),
 	CE_INTVAL(region),
-	CE_INTVAL_V(g_scaler, 2),
+	CE_INTVAL_V(g_scaler, 3),
 	CE_INTVAL(g_gamma),
 	CE_INTVAL(g_layer_x),
 	CE_INTVAL(g_layer_y),
 	CE_INTVAL(g_layer_w),
 	CE_INTVAL(g_layer_h),
 	CE_INTVAL(soft_filter),
+	CE_INTVAL(scanlines),
+	CE_INTVAL(scanline_level),
 	CE_INTVAL(plat_target.vout_method),
 	CE_INTVAL(plat_target.hwfilter),
 	CE_INTVAL(plat_target.vout_fullscreen),
@@ -409,6 +414,8 @@ static const struct {
 	CE_INTVAL(in_type_sel1),
 	CE_INTVAL(in_type_sel2),
 	CE_INTVAL(analog_deadzone),
+	CE_INTVAL(memcard1_sel),
+	CE_INTVAL(memcard2_sel),
 	CE_INTVAL_N("adev0_is_nublike", in_adev_is_nublike[0]),
 	CE_INTVAL_N("adev1_is_nublike", in_adev_is_nublike[1]),
 	CE_INTVAL_V(frameskip, 3),
@@ -431,9 +438,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),
@@ -665,6 +673,29 @@ fail:
 		if (strcmp(Config.Spu, spu_plugins[i]) == 0)
 			{ spu_plugsel = i; break; }
 
+	// memcard selections
+	char mcd1_old[sizeof(Config.Mcd1)];
+	char mcd2_old[sizeof(Config.Mcd2)];
+	strcpy(mcd1_old, Config.Mcd1);
+	strcpy(mcd2_old, Config.Mcd2);
+
+	if ((unsigned int)memcard1_sel < ARRAY_SIZE(memcards)) {
+		if (memcard1_sel == 0)
+			strcpy(Config.Mcd1, "none");
+		else if (memcards[memcard1_sel] != NULL)
+			snprintf(Config.Mcd1, sizeof(Config.Mcd1), ".%s%s",
+				MEMCARD_DIR, memcards[memcard1_sel]);
+	}
+	if ((unsigned int)memcard2_sel < ARRAY_SIZE(memcards)) {
+		if (memcard2_sel == 0)
+			strcpy(Config.Mcd2, "none");
+		else if (memcards[memcard2_sel] != NULL)
+			snprintf(Config.Mcd2, sizeof(Config.Mcd2), ".%s%s",
+				MEMCARD_DIR, memcards[memcard2_sel]);
+	}
+	if (strcmp(mcd1_old, Config.Mcd1) || strcmp(mcd2_old, Config.Mcd2))
+		LoadMcds(Config.Mcd1, Config.Mcd2);
+
 	return ret;
 }
 
@@ -1195,17 +1226,22 @@ static int menu_loop_keyconfig(int id, int keys)
 
 // ------------ gfx options menu ------------
 
-static const char *men_scaler[] = { "1x1", "scaled 4:3", "integer scaled 4:3", "fullscreen", "custom", NULL };
+static const char *men_scaler[] = {
+	"1x1", "integer scaled 2x", "scaled 4:3", "integer scaled 4:3", "fullscreen", "custom", NULL
+};
 static const char *men_soft_filter[] = { "None",
 #ifdef __ARM_NEON__
 	"scale2x", "eagle2x",
 #endif
 	NULL };
 static const char *men_dummy[] = { NULL };
+static const char h_scaler[]    = "int. 2x  - scales w. or h. 2x if it fits on screen\n"
+				  "int. 4:3 - uses integer if possible, else fractional";
 static const char h_cscaler[]   = "Displays the scaler layer, you can resize it\n"
 				  "using d-pad or move it using R+d-pad";
 static const char h_overlay[]   = "Overlay provides hardware accelerated scaling";
 static const char h_soft_filter[] = "Works only if game uses low resolution modes";
+static const char h_scanline_l[]  = "Scanline brightness, 0-100%";
 static const char h_gamma[]     = "Gamma/brightness adjustment (default 100)";
 
 static int menu_loop_cscaler(int id, int keys)
@@ -1262,11 +1298,15 @@ static int menu_loop_cscaler(int id, int keys)
 
 static menu_entry e_menu_gfx_options[] =
 {
-	mee_enum      ("Scaler",                   MA_OPT_VARSCALER, g_scaler, men_scaler),
+	mee_enum_h    ("Scaler",                   MA_OPT_VARSCALER, g_scaler, men_scaler, h_scaler),
 	mee_enum      ("Video output mode",        MA_OPT_VOUT_MODE, plat_target.vout_method, men_dummy),
 	mee_onoff     ("Software Scaling",         MA_OPT_SCALER2, soft_scaling, 1),
 	mee_enum      ("Hardware Filter",          MA_OPT_HWFILTER, plat_target.hwfilter, men_dummy),
 	mee_enum_h    ("Software Filter",          MA_OPT_SWFILTER, soft_filter, men_soft_filter, h_soft_filter),
+#ifdef __ARM_NEON__
+	mee_onoff     ("Scanlines",                MA_OPT_SCANLINES, scanlines, 1),
+	mee_range_h   ("Scanline brightness",      MA_OPT_SCANLINE_LEVEL, scanline_level, 0, 100, h_scanline_l),
+#endif
 	mee_range_h   ("Gamma adjustment",         MA_OPT_GAMMA, g_gamma, 1, 200, h_gamma),
 //	mee_onoff     ("Vsync",                    0, vsync, 1),
 	mee_cust_h    ("Setup custom scaler",      MA_OPT_VARSCALER_C, menu_loop_cscaler, NULL, h_cscaler),
@@ -1400,13 +1440,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,
 };
 
@@ -2080,12 +2123,12 @@ static int swap_cd_multidisk(void)
 
 static void load_pcsx_cht(void)
 {
-	const char *exts[] = { "cht", NULL };
+	static const char *exts[] = { "cht", NULL };
 	const char *fname;
-	char path[256];
+	char msg[64];
 
-	path[0] = 0;
-	fname = menu_loop_romsel(path, sizeof(path), exts, NULL);
+	fname = menu_loop_romsel(last_selected_fname,
+			sizeof(last_selected_fname), exts, NULL);
 	if (fname == NULL)
 		return;
 
@@ -2095,8 +2138,8 @@ static void load_pcsx_cht(void)
 	if (NumCheats == 0 && NumCodes == 0)
 		menu_update_msg("failed to load cheats");
 	else {
-		snprintf(path, sizeof(path), "%d cheat(s) loaded", NumCheats + NumCodes);
-		menu_update_msg(path);
+		snprintf(msg, sizeof(msg), "%d cheat(s) loaded", NumCheats + NumCodes);
+		menu_update_msg(msg);
 	}
 	me_enable(e_menu_main, MA_MAIN_CHEATS, ready_to_go && NumCheats);
 }