frontend: add toggle FPS option

[pcsx_rearmed.git] / frontend / main.c

diff --git a/frontend/main.c b/frontend/main.c
index 53e3674..4aa8968 100644 (file)
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -1,5 +1,5 @@
 /*
 /*

- * (C) notaz, 2010-2011
+ * (C) notaz, 2010-2012

  *
  * This work is licensed under the terms of the GNU GPLv2 or later.
  * See the COPYING file in the top-level directory.
  *
  * This work is licensed under the terms of the GNU GPLv2 or later.
  * See the COPYING file in the top-level directory.


@@ -32,6 +32,9 @@
 #include "libpicofe/plat.h"
 #include "libpicofe/readpng.h"
 #endif
 #include "libpicofe/plat.h"
 #include "libpicofe/readpng.h"
 #endif

+#ifndef BOOT_MSG
+#define BOOT_MSG "Booting up..."
+#endif

 
 // don't include debug.h - it breaks ARM build (R1 redefined)
 void StartDebugger();
 
 // don't include debug.h - it breaks ARM build (R1 redefined)
 void StartDebugger();


@@ -249,6 +252,15 @@ do_state_slot:
                toggle_fast_forward(0);
                plugin_call_rearmed_cbs();
                break;
                toggle_fast_forward(0);
                plugin_call_rearmed_cbs();
                break;

+       case SACTION_TOGGLE_FPS:
+               if ((g_opts & (OPT_SHOWFPS|OPT_SHOWCPU))
+                   == (OPT_SHOWFPS|OPT_SHOWCPU))
+                       g_opts &= ~(OPT_SHOWFPS|OPT_SHOWCPU);
+               else if (g_opts & OPT_SHOWFPS)
+                       g_opts |= OPT_SHOWCPU;
+               else
+                       g_opts |= OPT_SHOWFPS;
+               break;

        case SACTION_SCREENSHOT:
                {
                        char buf[MAXPATHLEN];
        case SACTION_SCREENSHOT:
                {
                        char buf[MAXPATHLEN];


@@ -393,7 +405,7 @@ out:
        fclose(f);
 }
 
        fclose(f);
 }
 

-void emu_on_new_cd(void)
+void emu_on_new_cd(int show_hud_msg)

 {
        ClearAllCheats();
        parse_cwcheat();
 {
        ClearAllCheats();
        parse_cwcheat();


@@ -403,8 +415,10 @@ void emu_on_new_cd(void)
                printf("----------------------------------------------------------\n");
        }
 
                printf("----------------------------------------------------------\n");
        }
 

-       snprintf(hud_msg, sizeof(hud_msg), "Booting up...");
-       hud_new_msg = 2;
+       if (show_hud_msg) {
+               snprintf(hud_msg, sizeof(hud_msg), BOOT_MSG);
+               hud_new_msg = 3;
+       }

 }
 
 int emu_core_preinit(void)
 }
 
 int emu_core_preinit(void)


@@ -560,7 +574,7 @@ int main(int argc, char *argv[])
                                printf(_("Could not load CD-ROM!\n"));
                                return -1;
                        }
                                printf(_("Could not load CD-ROM!\n"));
                                return -1;
                        }

-                       emu_on_new_cd();
+                       emu_on_new_cd(!loadst);

                        ready_to_go = 1;
                }
        }
                        ready_to_go = 1;
                }
        }


@@ -718,6 +732,8 @@ int emu_load_state(int slot)
        char fname[MAXPATHLEN];
        int ret;
 
        char fname[MAXPATHLEN];
        int ret;
 

+       hud_msg[0] = 0;
+

        ret = get_state_filename(fname, sizeof(fname), slot);
        if (ret != 0)
                return ret;
        ret = get_state_filename(fname, sizeof(fname), slot);
        if (ret != 0)
                return ret;