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

diff --git a/common/emu.c b/common/emu.c
index cee9f2d..becc0c2 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;
 
@@ -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;
@@ -1410,9 +1429,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 +1436,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();
 }