improve cd change handling

[libpicofe.git] / common / emu.c

diff --git a/common/emu.c b/common/emu.c
index 7c406b5..7de2aa9 100644 (file)
--- a/common/emu.c
+++ b/common/emu.c
@@ -25,6 +25,8 @@
 #include <zlib/zlib.h>\r
 \r
 \r
+#define STATUS_MSG_TIMEOUT 2000\r
+\r
 void *g_screen_ptr;\r
 \r
 #if !SCREEN_SIZE_FIXED\r
@@ -78,9 +80,9 @@ static int try_rfn_cut(char *fname)
        return 0;\r
 }\r
 \r
-static void get_ext(char *file, char *ext)\r
+static void get_ext(const char *file, char *ext)\r
 {\r
-       char *p;\r
+       const char *p;\r
 \r
        p = file + strlen(file) - 4;\r
        if (p < file) p = file;\r
@@ -92,23 +94,29 @@ static void get_ext(char *file, char *ext)
 void emu_status_msg(const char *format, ...)\r
 {\r
        va_list vl;\r
+       int ret;\r
 \r
        va_start(vl, format);\r
-       vsnprintf(noticeMsg, sizeof(noticeMsg), format, vl);\r
+       ret = vsnprintf(noticeMsg, sizeof(noticeMsg), format, vl);\r
        va_end(vl);\r
 \r
+       /* be sure old text gets overwritten */\r
+       for (; ret < 28; ret++)\r
+               noticeMsg[ret] = ' ';\r
+       noticeMsg[ret] = 0;\r
+\r
        notice_msg_time = plat_get_ticks_ms();\r
 }\r
 \r
-static const char *biosfiles_us[] = { "us_scd1_9210", "us_scd2_9306", "SegaCDBIOS9303" };\r
-static const char *biosfiles_eu[] = { "eu_mcd1_9210", "eu_mcd2_9306", "eu_mcd2_9303"   };\r
-static const char *biosfiles_jp[] = { "jp_mcd1_9112", "jp_mcd1_9111" };\r
+static const char * const biosfiles_us[] = { "us_scd1_9210", "us_scd2_9306", "SegaCDBIOS9303" };\r
+static const char * const biosfiles_eu[] = { "eu_mcd1_9210", "eu_mcd2_9306", "eu_mcd2_9303"   };\r
+static const char * const biosfiles_jp[] = { "jp_mcd1_9112", "jp_mcd1_9111" };\r
 \r
 static int find_bios(int region, char **bios_file)\r
 {\r
        static char bios_path[1024];\r
        int i, count;\r
-       const char **files;\r
+       const char * const *files;\r
        FILE *f = NULL;\r
 \r
        if (region == 4) { // US\r
@@ -169,12 +177,13 @@ static unsigned char id_header[0x100];
 \r
 /* checks if fname points to valid MegaCD image\r
  * if so, checks for suitable BIOS */\r
-int emu_cd_check(int *pregion, char *fname_in)\r
+static int emu_cd_check(int *pregion, const char *fname_in)\r
 {\r
+       const char *fname = fname_in;\r
        unsigned char buf[32];\r
        pm_file *cd_f;\r
        int region = 4; // 1: Japan, 4: US, 8: Europe\r
-       char ext[5], *fname = fname_in;\r
+       char ext[5];\r
        cue_track_type type = CT_UNKNOWN;\r
        cue_data_t *cue_data = NULL;\r
 \r
@@ -523,6 +532,24 @@ fail:
        return 0;\r
 }\r
 \r
+int emu_swap_cd(const char *fname)\r
+{\r
+       cd_img_type cd_type;\r
+       int ret = -1;\r
+\r
+       cd_type = emu_cd_check(NULL, fname);\r
+       if (cd_type != CIT_NOT_CD)\r
+               ret = Insert_CD(fname, cd_type);\r
+       if (ret != 0) {\r
+               me_update_msg("Load failed, invalid CD image?");\r
+               return 0;\r
+       }\r
+\r
+       strncpy(rom_fname_loaded, fname, sizeof(rom_fname_loaded)-1);\r
+       rom_fname_loaded[sizeof(rom_fname_loaded)-1] = 0;\r
+       return 1;\r
+}\r
+\r
 static void romfname_ext(char *dst, const char *prefix, const char *ext)\r
 {\r
        char *p;\r
@@ -924,7 +951,7 @@ int emu_save_load_game(int load, int sram)
                }\r
                else    ret = -1;\r
                if (!ret)\r
-                       emu_status_msg(load ? "GAME LOADED" : "GAME SAVED");\r
+                       emu_status_msg(load ? "STATE LOADED" : "STATE SAVED");\r
                else\r
                {\r
                        emu_status_msg(load ? "LOAD FAILED" : "SAVE FAILED");\r
@@ -1086,7 +1113,7 @@ static void run_events_ui(unsigned int which)
                        in_set_blocking(0);\r
                }\r
                if (do_it) {\r
-                       plat_status_msg_busy_first((which & PEV_STATE_LOAD) ? "LOADING GAME" : "SAVING GAME");\r
+                       plat_status_msg_busy_first((which & PEV_STATE_LOAD) ? "LOADING STATE" : "SAVING STATE");\r
                        PicoStateProgressCB = plat_status_msg_busy_next;\r
                        emu_save_load_game((which & PEV_STATE_LOAD) ? 1 : 0, 0);\r
                        PicoStateProgressCB = NULL;\r
@@ -1276,7 +1303,7 @@ void emu_loop(void)
                if (notice_msg_time != 0)\r
                {\r
                        static int noticeMsgSum;\r
-                       if (timestamp - ms_to_ticks(notice_msg_time) > ms_to_ticks(2000)) {\r
+                       if (timestamp - ms_to_ticks(notice_msg_time) > ms_to_ticks(STATUS_MSG_TIMEOUT)) {\r
                                notice_msg_time = 0;\r
                                plat_status_msg_clear();\r
                                notice_msg = NULL;\r
@@ -1330,6 +1357,10 @@ void emu_loop(void)
                        else {\r
                                pframes_done -= target_fps;\r
                                /* don't allow it to drift during heavy slowdowns */\r
+                               if (pframes_done < -5) {\r
+                                       reset_timing = 1;\r
+                                       continue;\r
+                               }\r
                                if (pframes_done < -2)\r
                                        pframes_done = -2;\r
                        }\r
@@ -1358,7 +1389,7 @@ void emu_loop(void)
                else if (diff > diff_lim)\r
                {\r
                        /* no time left for this frame - skip */\r
-                       if (diff - diff_lim >= ms_to_ticks(300)) {\r
+                       if (diff - diff_lim >= ms_to_ticks(200)) {\r
                                /* if too much behind, reset instead */\r
                                reset_timing = 1;\r
                                continue;\r