X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fmenu.c;h=754b6d230b3c9ba9548dc48dd2a83f72d7f148e8;hp=f2a24fd6c91fae63ccf3f76fd23f9e76ec8eab27;hb=c89cd762a63a78e30a59955e705e29ff3d5ae3b8;hpb=bce6b05695beb988b607eb1dd82c27c1ed841faa

diff --git a/frontend/menu.c b/frontend/menu.c
index f2a24fd6..754b6d23 100644
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -63,6 +63,7 @@ static int last_psx_w, last_psx_h, last_psx_bpp;
 static int scaling, filter, state_slot, cpu_clock, cpu_clock_st;
 static char rom_fname_reload[MAXPATHLEN];
 static char last_selected_fname[MAXPATHLEN];
+static int region;
 int g_opts;
 
 // from softgpu plugin
@@ -138,11 +139,27 @@ static int emu_save_load_game(int load, int sram)
 	return ret;
 }
 
+// propagate menu settings to the emu vars
+static void menu_sync_config(void)
+{
+	Config.PsxAuto = 1;
+	if (region > 0) {
+		Config.PsxAuto = 0;
+		Config.PsxType = region - 1;
+	}
+	pl_frame_interval = Config.PsxType ? 20000 : 16667;
+
+	// used by P.E.Op.S. frameskip code
+	fFrameRateHz = Config.PsxType ? 50.0f : 59.94f;
+	dwFrameRateTicks = (100000*100 / (unsigned long)(fFrameRateHz*100));
+}
+
 static void menu_set_defconfig(void)
 {
 	g_opts = 0;
 	scaling = SCALE_4_3;
 
+	region = 0;
 	Config.Xa = Config.Cdda = Config.Sio =
 	Config.SpuIrq = Config.RCntFix = Config.VSyncWA = 0;
 
@@ -153,6 +170,8 @@ static void menu_set_defconfig(void)
 	iUseInterpolation = 1;
 	iXAPitch = iSPUIRQWait = 0;
 	iUseTimer = 2;
+
+	menu_sync_config();
 }
 
 #define CE_CONFIG_STR(val) \
@@ -175,11 +194,10 @@ static const struct {
 	CE_CONFIG_STR(Bios),
 	CE_CONFIG_STR(Gpu),
 	CE_CONFIG_STR(Spu),
-	CE_CONFIG_STR(Cdr),
+//	CE_CONFIG_STR(Cdr),
 	CE_CONFIG_VAL(Xa),
 	CE_CONFIG_VAL(Sio),
 	CE_CONFIG_VAL(Mdec),
-	CE_CONFIG_VAL(PsxAuto),
 	CE_CONFIG_VAL(Cdda),
 	CE_CONFIG_VAL(Debug),
 	CE_CONFIG_VAL(PsxOut),
@@ -187,7 +205,7 @@ static const struct {
 	CE_CONFIG_VAL(RCntFix),
 	CE_CONFIG_VAL(VSyncWA),
 	CE_CONFIG_VAL(Cpu),
-	CE_CONFIG_VAL(PsxType),
+	CE_INTVAL(region),
 	CE_INTVAL(scaling),
 	CE_INTVAL(g_layer_x),
 	CE_INTVAL(g_layer_y),
@@ -207,9 +225,9 @@ static const struct {
 	CE_INTVAL(iUseTimer),
 };
 
-static void make_cfg_fname(char *buf, size_t size, int is_game)
+static char *get_cd_label(void)
 {
-	char trimlabel[33];
+	static char trimlabel[33];
 	int j;
 
 	strncpy(trimlabel, CdromLabel, 32);
@@ -218,8 +236,13 @@ static void make_cfg_fname(char *buf, size_t size, int is_game)
 		if (trimlabel[j] == ' ')
 			trimlabel[j] = 0;
 
+	return trimlabel;
+}
+
+static void make_cfg_fname(char *buf, size_t size, int is_game)
+{
 	if (is_game)
-		snprintf(buf, size, "." PCSX_DOT_DIR "cfg/%.32s-%.9s.cfg", trimlabel, CdromId);
+		snprintf(buf, size, "." PCSX_DOT_DIR "cfg/%.32s-%.9s.cfg", get_cd_label(), CdromId);
 	else
 		snprintf(buf, size, "." PCSX_DOT_DIR "%s", cfgfile_basename);
 }
@@ -358,6 +381,8 @@ static int menu_load_config(int is_game)
 		}
 	}
 
+	menu_sync_config();
+
 	// sync plugins
 	for (i = bios_sel = 0; bioses[i] != NULL; i++)
 		if (strcmp(Config.Bios, bioses[i]) == 0)
@@ -382,8 +407,8 @@ fail:
 // rrrr rggg gggb bbbb
 static unsigned short fname2color(const char *fname)
 {
-	static const char *cdimg_exts[] = { ".bin", ".img", ".iso", ".z", ".cue" };
-	static const char *other_exts[] = { ".ccd", ".toc", ".mds", ".sub", ".table" };
+	static const char *cdimg_exts[] = { ".bin", ".img", ".iso", ".cue", ".z", ".bz", ".znx", ".pbp" };
+	static const char *other_exts[] = { ".ccd", ".toc", ".mds", ".sub", ".table", ".index" };
 	const char *ext = strrchr(fname, '.');
 	int i;
 
@@ -528,7 +553,7 @@ static void pnd_menu_init(void)
 	struct dirent *ent;
 	int i, count = 0;
 	char **mfilters;
-	char buff[64], *p;
+	char buff[64];
 	DIR *dir;
 
 	cpu_clock_st = cpu_clock = get_cpu_clock();
@@ -547,9 +572,11 @@ static void pnd_menu_init(void)
 				perror("readdir");
 			break;
 		}
-		p = strstr(ent->d_name, "_up");
-		if (p != NULL && (p[3] == 0 || !strcmp(p + 3, "_h")))
-			count++;
+
+		if (ent->d_type != DT_REG && ent->d_type != DT_LNK)
+			continue;
+
+		count++;
 	}
 
 	if (count == 0)
@@ -563,11 +590,21 @@ static void pnd_menu_init(void)
 	for (i = 0; (ent = readdir(dir)); ) {
 		size_t len;
 
-		p = strstr(ent->d_name, "_up");
-		if (p == NULL || (p[3] != 0 && strcmp(p + 3, "_h")))
+		if (ent->d_type != DT_REG && ent->d_type != DT_LNK)
+			continue;
+
+		len = strlen(ent->d_name);
+
+		// skip pre-HF5 extra files
+		if (len >= 3 && strcmp(ent->d_name + len - 3, "_v3") == 0)
 			continue;
+		if (len >= 3 && strcmp(ent->d_name + len - 3, "_v5") == 0)
+			continue;
+
+		// have to cut "_up_h" for pre-HF5
+		if (len > 5 && strcmp(ent->d_name + len - 5, "_up_h") == 0)
+			len -= 5;
 
-		len = p - ent->d_name;
 		if (len > sizeof(buff) - 1)
 			continue;
 
@@ -815,7 +852,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_thread[]    = "Run sound emulation in separate thread";
+static const char h_spu_thread[]    = "Run sound emulation in main thread (recommended)";
 
 static menu_entry e_menu_plugin_spu[] =
 {
@@ -823,7 +860,7 @@ static menu_entry e_menu_plugin_spu[] =
 	mee_enum      ("Interpolation",             0, iUseInterpolation, men_spu_interp),
 	mee_onoff     ("Adjust XA pitch",           0, iXAPitch, 1),
 	mee_onoff_h   ("SPU IRQ Wait",              0, iSPUIRQWait, 1, h_spu_irq_wait),
-	mee_onoff_h   ("Use sound thread",          0, iUseTimer, 1, h_spu_thread),
+	mee_onoff_h   ("Sound in main thread",      0, iUseTimer, 2, h_spu_thread),
 	mee_end,
 };
 
@@ -871,7 +908,7 @@ static int menu_loop_plugin_options(int id, int keys)
 // ------------ adv options menu ------------
 
 static const char h_cfg_cpul[]   = "Shows CPU usage in %%";
-static const char h_cfg_fl[]     = "Keeps the game from running too fast";
+static const char h_cfg_fl[]     = "Frame Limiter keeps the game from running too fast";
 static const char h_cfg_xa[]     = "Disables XA sound, which can sometimes improve performance";
 static const char h_cfg_cdda[]   = "Disable CD Audio for a performance boost\n"
 				   "(proper .cue/.bin dump is needed otherwise)";
@@ -912,7 +949,7 @@ static int mh_restore_defaults(int id, int keys)
 	return 1;
 }
 
-static const char *men_region[]       = { "NTSC", "PAL", NULL };
+static const char *men_region[]       = { "Auto", "NTSC", "PAL", NULL };
 /*
 static const char *men_confirm_save[] = { "OFF", "writes", "loads", "both", NULL };
 static const char h_confirm_save[]    = "Ask for confirmation when overwriting save,\n"
@@ -927,7 +964,7 @@ static menu_entry e_menu_options[] =
 //	mee_enum_h    ("Confirm savestate",        0, dummy, men_confirm_save, h_confirm_save),
 	mee_onoff     ("Frameskip",                0, UseFrameSkip, 1),
 	mee_onoff     ("Show FPS",                 0, g_opts, OPT_SHOWFPS),
-	mee_enum      ("Region",                   0, Config.PsxType, men_region),
+	mee_enum      ("Region",                   0, region, men_region),
 	mee_range     ("CPU clock",                MA_OPT_CPU_CLOCKS, cpu_clock, 20, 5000),
 	mee_handler   ("[Display]",                menu_loop_gfx_options),
 	mee_handler   ("[BIOS/Plugins]",           menu_loop_plugin_options),
@@ -980,15 +1017,30 @@ static void debug_menu_loop(void)
 
 void OnFile_Exit();
 
+static void draw_frame_main(void)
+{
+	if (CdromId[0] != 0) {
+		char buff[64];
+		snprintf(buff, sizeof(buff), "%.32s/%.9s (running as %s)",
+			 get_cd_label(), CdromId, Config.PsxType ? "PAL" : "NTSC");
+		smalltext_out16(4, 1, buff, 0x105f);
+	}
+}
+
+static void draw_frame_credits(void)
+{
+	smalltext_out16(4, 1, "build: "__DATE__ " " __TIME__ " " REV, 0xe7fc);
+}
+
 const char *plat_get_credits(void)
 {
 	return	"PCSX-ReARMed\n\n"
 		"(C) 1999-2003 PCSX Team\n"
 		"(C) 2005-2009 PCSX-df Team\n"
-		"(C) 2009-2010 PCSX-Reloaded Team\n\n"
+		"(C) 2009-2011 PCSX-Reloaded Team\n\n"
 		"GPU and SPU code by Pete Bernert\n"
 		"  and the P.E.Op.S. team\n"
-		"ARM recompiler (C) 2009-2010 Ari64\n"
+		"ARM recompiler (C) 2009-2011 Ari64\n"
 		"PCSX4ALL plugins by PCSX4ALL team\n"
 		"  Chui, Franxis, Unai\n\n"
 		"integration, optimization and\n"
@@ -1132,7 +1184,7 @@ static int main_menu_handler(int id, int keys)
 			return 1;
 		break;
 	case MA_MAIN_CREDITS:
-		draw_menu_credits(draw_frame_debug);
+		draw_menu_credits(draw_frame_credits);
 		in_menu_wait(PBTN_MOK|PBTN_MBACK, 70);
 		break;
 	case MA_MAIN_EXIT:
@@ -1182,7 +1234,7 @@ void menu_loop(void)
 	in_set_config_int(0, IN_CFG_BLOCKING, 1);
 
 	do {
-		me_loop(e_menu_main, &sel, NULL);
+		me_loop(e_menu_main, &sel, draw_frame_main);
 	} while (!ready_to_go);
 
 	/* wait until menu, ok, back is released */
@@ -1353,6 +1405,9 @@ static void menu_leave_emu(void)
 			menu_darken_bg(d, s, w, 0);
 	}
 
+	if (ready_to_go)
+		cpu_clock = get_cpu_clock();
+
 	plat_video_menu_enter(ready_to_go);
 }
 
@@ -1391,7 +1446,7 @@ void menu_prepare_emu(void)
 	if (Config.Cdda)
 		CDR_stop();
 
-	pl_frame_interval = Config.PsxType ? 20000 : 16667;
+	menu_sync_config();
 
 	if (GPU_open != NULL) {
 		int ret = GPU_open(&gpuDisp, "PCSX", NULL);