diff options
| -rw-r--r-- | funkey/fk_instant_play.c | 12 | ||||
| -rw-r--r-- | funkey/fk_instant_play.h | 1 | ||||
| -rw-r--r-- | main.c | 15 | ||||
| -rw-r--r-- | main.h | 5 |
4 files changed, 32 insertions, 1 deletions
diff --git a/funkey/fk_instant_play.c b/funkey/fk_instant_play.c index eeacae8..a4aebd3 100644 --- a/funkey/fk_instant_play.c +++ b/funkey/fk_instant_play.c @@ -64,12 +64,23 @@ static void handle_sigusr1(int signal) } pclose(fp); + if (in_menu) { + FK_Suspend(); + } else { + /* Wait for the core to be ready to save */ + should_suspend = true; + } +} + +void FK_Suspend(void) +{ state_slot = AUTOSAVE_SLOT; if(!state_write()) { printf("Save failed"); state_slot = 0; } + sram_write(); save_config(CONFIG_TYPE_AUTO); /* Perform Instant Play save and shutdown */ @@ -82,6 +93,7 @@ static void handle_sigusr1(int signal) exit(0); } + void FK_InitInstantPlay(int argc, char **argv) { prog_name = argv[0]; diff --git a/funkey/fk_instant_play.h b/funkey/fk_instant_play.h index b3e3845..5185065 100644 --- a/funkey/fk_instant_play.h +++ b/funkey/fk_instant_play.h @@ -41,6 +41,7 @@ extern "C" { #define AUTOSAVE_SLOT 99 extern void FK_InitInstantPlay(int argc, char **argv); +extern void FK_Suspend(void); /* Ends C function definitions when using C++ */ #ifdef __cplusplus @@ -26,8 +26,10 @@ char save_template_path[MAX_PATH]; #include "funkey/fk_menu.h" #include "funkey/fk_instant_play.h" static bool instant_play = false; +bool should_suspend = false; #endif +bool in_menu = false; bool should_quit = false; unsigned current_audio_buffer_size; char core_name[MAX_PATH]; @@ -211,6 +213,10 @@ void set_defaults(void) scale_size = SCALE_SIZE_NONE; scale_filter = SCALE_FILTER_NEAREST; +#ifdef FUNKEY_S + enable_drc = 0; +#endif + /* Sets better defaults for small screen */ if (SCREEN_WIDTH == 240) { scale_size = SCALE_SIZE_CROP; @@ -372,6 +378,7 @@ void handle_emu_action(emu_action action) case EACTION_MENU: toggle_fast_forward(1); /* Force FF off */ sram_write(); + in_menu = true; #if defined(MMENU) if (mmenu && content && content->path) { ShowMenu_t ShowMenu = (ShowMenu_t)dlsym(mmenu, "ShowMenu"); @@ -424,6 +431,7 @@ void handle_emu_action(emu_action action) #else menu_loop(); #endif + in_menu = false; break; case EACTION_TOGGLE_HUD: show_hud = !show_hud; @@ -592,7 +600,7 @@ int main(int argc, char **argv) { } if (argc > 1 && argv[1]) { - if (!realpath(argv[1], &core_path)) { + if (!realpath(argv[1], core_path)) { strncpy(core_path, argv[1], sizeof(core_path) - 1); } } else { @@ -677,6 +685,11 @@ int main(int argc, char **argv) { count_fps(); adjust_audio(); current_core.retro_run(); +#ifdef FUNKEY_S + if (should_suspend) + FK_Suspend(); +#endif + if (!should_quit) plat_video_flip(); } while (!should_quit); @@ -27,6 +27,11 @@ typedef enum { CONFIG_TYPE_AUTO, } config_type; +#ifdef FUNKEY_S +extern bool should_suspend; +#endif + +extern bool in_menu; extern bool should_quit; extern unsigned current_audio_buffer_size; extern char core_name[MAX_PATH]; |