X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=common%2Femu.c;h=2e813d3d5e6b5340328fc41124f43c02c4f82897;hb=0f4090a90a3d5337db985325f38c7de7ca757847;hp=cee9f2d7c1fa6572f98b00f685865125f31c6f0f;hpb=22b2271a09c970cf2d4c9ba28460f7a5aa2a6127;p=libpicofe.git

diff --git a/common/emu.c b/common/emu.c
index cee9f2d..2e813d3 100644
--- a/common/emu.c
+++ b/common/emu.c
@@ -80,9 +80,9 @@ static int try_rfn_cut(char *fname)
 	return 0;
 }
 
-static void get_ext(char *file, char *ext)
+static void get_ext(const char *file, char *ext)
 {
-	char *p;
+	const char *p;
 
 	p = file + strlen(file) - 4;
 	if (p < file) p = file;
@@ -177,12 +177,13 @@ static unsigned char id_header[0x100];
 
 /* checks if fname points to valid MegaCD image
  * if so, checks for suitable BIOS */
-int emu_cd_check(int *pregion, char *fname_in)
+static int emu_cd_check(int *pregion, const char *fname_in)
 {
+	const char *fname = fname_in;
 	unsigned char buf[32];
 	pm_file *cd_f;
 	int region = 4; // 1: Japan, 4: US, 8: Europe
-	char ext[5], *fname = fname_in;
+	char ext[5];
 	cue_track_type type = CT_UNKNOWN;
 	cue_data_t *cue_data = NULL;
 
@@ -406,8 +407,8 @@ int emu_reload_rom(char *rom_fname)
 		// valid CD image, check for BIOS..
 
 		// we need to have config loaded at this point
-		ret = emu_read_config(1, 1);
-		if (!ret) emu_read_config(0, 1);
+		ret = emu_read_config(1, 0);
+		if (!ret) emu_read_config(0, 0);
 		cfg_loaded = 1;
 
 		if (PicoRegionOverride) {
@@ -464,8 +465,8 @@ int emu_reload_rom(char *rom_fname)
 	if (!(PicoAHW & PAHW_MCD))
 		memcpy(id_header, rom_data + 0x100, sizeof(id_header));
 	if (!cfg_loaded) {
-		ret = emu_read_config(1, 1);
-		if (!ret) emu_read_config(0, 1);
+		ret = emu_read_config(1, 0);
+		if (!ret) emu_read_config(0, 0);
 	}
 
 	lprintf("PicoCartInsert(%p, %d);\n", rom_data, rom_size);
@@ -531,6 +532,24 @@ fail:
 	return 0;
 }
 
+int emu_swap_cd(const char *fname)
+{
+	cd_img_type cd_type;
+	int ret = -1;
+
+	cd_type = emu_cd_check(NULL, fname);
+	if (cd_type != CIT_NOT_CD)
+		ret = Insert_CD(fname, cd_type);
+	if (ret != 0) {
+		me_update_msg("Load failed, invalid CD image?");
+		return 0;
+	}
+
+	strncpy(rom_fname_loaded, fname, sizeof(rom_fname_loaded)-1);
+	rom_fname_loaded[sizeof(rom_fname_loaded)-1] = 0;
+	return 1;
+}
+
 static void romfname_ext(char *dst, const char *prefix, const char *ext)
 {
 	char *p;
@@ -594,10 +613,11 @@ int emu_read_config(int game, int no_defaults)
 	char cfg[512];
 	int ret;
 
+	if (!no_defaults)
+		emu_set_defconfig();
+
 	if (!game)
 	{
-		if (!no_defaults)
-			emu_set_defconfig();
 		make_config_cfg(cfg);
 		ret = config_readsect(cfg, NULL);
 	}
@@ -624,7 +644,8 @@ int emu_read_config(int game, int no_defaults)
 			// read global config, and apply game_def.cfg on top
 			make_config_cfg(cfg);
 			config_readsect(cfg, NULL);
-			ret = config_readsect("game_def.cfg", sect);
+			emu_make_path(cfg, "game_def.cfg", sizeof(cfg));
+			ret = config_readsect(cfg, sect);
 		}
 
 		if (ret == 0)
@@ -776,7 +797,8 @@ char *emu_get_save_fname(int load, int is_sram, int slot)
 
 	if (is_sram)
 	{
-		romfname_ext(saveFname, (PicoAHW&1) ? "brm"PATH_SEP : "srm"PATH_SEP, (PicoAHW&1) ? ".brm" : ".srm");
+		romfname_ext(saveFname, (PicoAHW & PAHW_MCD) ? "brm"PATH_SEP : "srm"PATH_SEP,
+				(PicoAHW & PAHW_MCD) ? ".brm" : ".srm");
 		if (load) {
 			if (try_ropen_file(saveFname)) return saveFname;
 			// try in current dir..
@@ -968,9 +990,14 @@ void emu_set_fastforward(int set_on)
 	}
 }
 
-static void emu_msg_tray_open(void)
+static void emu_tray_open(void)
 {
-	emu_status_msg("CD tray opened");
+	engineState = PGS_TrayMenu;
+}
+
+static void emu_tray_close(void)
+{
+	emu_status_msg("CD tray closed.");
 }
 
 void emu_reset_game(void)
@@ -1192,8 +1219,8 @@ void emu_init(void)
 
 	PicoInit();
 	PicoMessage = plat_status_msg_busy_next;
-	PicoMCDopenTray = emu_msg_tray_open;
-	PicoMCDcloseTray = menu_loop_tray;
+	PicoMCDopenTray = emu_tray_open;
+	PicoMCDcloseTray = emu_tray_close;
 }
 
 void emu_finish(void)
@@ -1256,9 +1283,6 @@ void emu_loop(void)
 	if (PicoAHW & PAHW_MCD)
 		PicoCDBufferInit();
 
-	if (currentConfig.EmuOpt & EOPT_PSYNC)
-		plat_video_wait_vsync();
-
 	pemu_loop_prep();
 
 	timestamp_fps = get_ticks();
@@ -1266,6 +1290,8 @@ void emu_loop(void)
 
 	frames_done = frames_shown = pframes_done = 0;
 
+	plat_video_wait_vsync();
+
 	/* loop with resync every 1 sec. */
 	while (engineState == PGS_Running)
 	{
@@ -1394,12 +1420,9 @@ void emu_loop(void)
 			if (diff < diff_lim)
 			{
 				// we are too fast
-				if (currentConfig.EmuOpt & EOPT_PSYNC) {
-					if (diff_lim - diff > target_frametime/2)
-						plat_wait_till_us(timestamp_base + target_frametime/4);
+				plat_wait_till_us(timestamp_base + diff_lim - target_frametime / 4);
+				if (currentConfig.EmuOpt & EOPT_VSYNC)
 					plat_video_wait_vsync();
-				} else
-					plat_wait_till_us(timestamp_base + diff_lim);
 			}
 		}
 
@@ -1410,9 +1433,6 @@ void emu_loop(void)
 
 	emu_set_fastforward(0);
 
-	if (PicoAHW & PAHW_MCD)
-		PicoCDBufferFree();
-
 	// save SRAM
 	if ((currentConfig.EmuOpt & EOPT_EN_SRAM) && SRam.changed) {
 		plat_status_msg_busy_first("Writing SRAM/BRAM...");
@@ -1420,9 +1440,11 @@ void emu_loop(void)
 		SRam.changed = 0;
 	}
 
-	// do menu background to be sure it's right
-	pemu_forced_frame(POPT_EN_SOFTSCALE);
-
 	pemu_loop_end();
+
+	// pemu_loop_end() might want to do 1 frame for bg image,
+	// so free CD buffer here
+	if (PicoAHW & PAHW_MCD)
+		PicoCDBufferFree();
 }