platform ps2+psp, fix display out of sync on hotkey save/load

diff --git a/platform/common/emu.c b/platform/common/emu.c
index 8f7baed..cd0c2e5 100644 (file)
--- a/platform/common/emu.c
+++ b/platform/common/emu.c
@@ -1251,6 +1251,7 @@ static void run_events_ui(unsigned int which)
                        emu_save_load_game((which & PEV_STATE_LOAD) ? 1 : 0, 0);\r
                        PicoStateProgressCB = NULL;\r
                }\r
+               plat_status_msg_busy_done();\r
        }\r
        if (which & PEV_SWITCH_RND)\r
        {\r

diff --git a/platform/common/emu.h b/platform/common/emu.h
index c477883..5fb0bf2 100644 (file)
--- a/platform/common/emu.h
+++ b/platform/common/emu.h
@@ -191,6 +191,7 @@ void plat_finish(void);
 /* used before things blocking for a while (these funcs redraw on return) */
 void plat_status_msg_busy_first(const char *msg);
 void plat_status_msg_busy_next(const char *msg);
+void plat_status_msg_busy_done(void);
 void plat_status_msg_clear(void);
 
 void plat_video_toggle_renderer(int change, int menu_call);

diff --git a/platform/gp2x/emu.c b/platform/gp2x/emu.c
index 8a1fda8..bebde8b 100644 (file)
--- a/platform/gp2x/emu.c
+++ b/platform/gp2x/emu.c
@@ -544,6 +544,10 @@ void plat_status_msg_busy_first(const char *msg)
        plat_status_msg_busy_next(msg);\r
 }\r
 \r
+void plat_status_msg_busy_done(void)\r
+{\r
+}\r
+\r
 static void vid_reset_mode(void)\r
 {\r
        int gp2x_mode = 16;\r

diff --git a/platform/linux/emu.c b/platform/linux/emu.c
index 9c9d16c..fd9c3b7 100644 (file)
--- a/platform/linux/emu.c
+++ b/platform/linux/emu.c
@@ -311,6 +311,10 @@ void plat_status_msg_busy_first(const char *msg)
        plat_status_msg_busy_next(msg);\r
 }\r
 \r
+void plat_status_msg_busy_done(void)\r
+{\r
+}\r
+\r
 void plat_update_volume(int has_changed, int is_up)\r
 {\r
 }\r

diff --git a/platform/pandora/plat.c b/platform/pandora/plat.c
index 1f056c8..60522ac 100644 (file)
--- a/platform/pandora/plat.c
+++ b/platform/pandora/plat.c
@@ -244,6 +244,10 @@ void plat_status_msg_busy_first(const char *msg)
        plat_status_msg_busy_next(msg);\r
 }\r
 \r
+void plat_status_msg_busy_done(void)\r
+{\r
+}\r
+\r
 void plat_update_volume(int has_changed, int is_up)\r
 {\r
 }\r

diff --git a/platform/ps2/emu.c b/platform/ps2/emu.c
index 5b0c051..d59615b 100644 (file)
--- a/platform/ps2/emu.c
+++ b/platform/ps2/emu.c
@@ -941,21 +941,29 @@ void plat_finish(void) {
        video_deinit();
 }
 
-/* display emulator status messages before holding emulation */
+/* display emulator status messages while holding emulation */
 void plat_status_msg_busy_first(const char *msg)
 {
+       // stop sound to make sure silence is played
+       pemu_sound_stop();
        plat_status_msg_busy_next(msg);
 }
 
 void plat_status_msg_busy_next(const char *msg)
 {
-       plat_status_msg_clear();
        pemu_finalize_frame("", msg);
+       // flip twice since our gskit pipeline has one frame delay
+       plat_video_flip();
        plat_video_flip();
        emu_status_msg("");
        reset_timing = 1;
 }
 
+void plat_status_msg_busy_done(void)
+{
+       pemu_sound_start();
+}
+
 /* clear status message area */
 void plat_status_msg_clear(void)
 {

diff --git a/platform/ps2/plat.c b/platform/ps2/plat.c
index 7e134e0..46f03c3 100644 (file)
--- a/platform/ps2/plat.c
+++ b/platform/ps2/plat.c
@@ -156,9 +156,9 @@ void plat_wait_till_us(unsigned int us_to)
 {
        // TODO hsync depends on NTSC/PAL (15750/15625 Hz), it however doesn't
        // matter if it falls a bit short, the while loop will catch the rest
-       unsigned hsyncs = (us_to - plat_get_ticks_us()) * 15620 / 1000000;
+       int hsyncs = (us_to - plat_get_ticks_us()) * 15620 / 1000000;
 
-       if (hsyncs && SetAlarm(hsyncs, alarm_cb, (void *)GetThreadId()) >= 0)
+       if (hsyncs > 0 && SetAlarm(hsyncs, alarm_cb, (void *)GetThreadId()) >= 0)
                SleepThread();
        while ((int)(us_to - plat_get_ticks_us()) > 0)
                RotateThreadReadyQueue(0);

diff --git a/platform/psp/emu.c b/platform/psp/emu.c
index a69f370..0b8c8fe 100644 (file)
--- a/platform/psp/emu.c
+++ b/platform/psp/emu.c
@@ -759,11 +759,17 @@ void plat_status_msg_busy_next(const char *msg)
 {
        plat_status_msg_clear();
        pemu_finalize_frame("", msg);
+       // flip twice since our GU pipeline has one frame delay
+       plat_video_flip();
        plat_video_flip();
        emu_status_msg("");
        reset_timing = 1;
 }
 
+void plat_status_msg_busy_done(void)
+{
+}
+
 /* clear status message area */
 void plat_status_msg_clear(void)
 {