frontend cleanup

[pcsx_rearmed.git] / frontend / menu.c

diff --git a/frontend/menu.c b/frontend/menu.c
index 0469868..e04d19e 100644 (file)
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -1,5 +1,5 @@
 /*
- * (C) Gražvydas "notaz" Ignotas, 2010
+ * (C) Gražvydas "notaz" Ignotas, 2010-2011
  *
  * This work is licensed under the terms of any of these licenses
  * (at your option):
@@ -13,12 +13,13 @@
 #include <errno.h>
 #include <dlfcn.h>
 
+#include "main.h"
 #include "menu.h"
 #include "config.h"
+#include "plugin.h"
 #include "plugin_lib.h"
 #include "omap.h"
 #include "common/plat.h"
-#include "../gui/Linux.h"
 #include "../libpcsxcore/misc.h"
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
 #include "revision.h"
@@ -56,9 +57,8 @@ enum {
        SCALE_CUSTOM,
 };
 
-extern int ready_to_go;
 static int last_psx_w, last_psx_h, last_psx_bpp;
-static int scaling, filter, state_slot, cpu_clock;
+static int scaling, filter, state_slot, cpu_clock, cpu_clock_st;
 static char rom_fname_reload[MAXPATHLEN];
 static char last_selected_fname[MAXPATHLEN];
 int g_opts;
@@ -100,32 +100,30 @@ void emu_make_path(char *buff, const char *end, int size)
 
 static int emu_check_save_file(int slot)
 {
-       char *fname;
+       char fname[MAXPATHLEN];
        int ret;
 
-       fname = get_state_filename(slot);
-       if (fname == NULL)
+       ret = get_state_filename(fname, sizeof(fname), slot);
+       if (ret != 0)
                return 0;
 
        ret = CheckState(fname);
-       free(fname);
        return ret == 0 ? 1 : 0;
 }
 
 static int emu_save_load_game(int load, int sram)
 {
-       char *fname;
+       char fname[MAXPATHLEN];
        int ret;
 
-       fname = get_state_filename(state_slot);
-       if (fname == NULL)
+       ret = get_state_filename(fname, sizeof(fname), state_slot);
+       if (ret != 0)
                return 0;
 
        if (load)
                ret = LoadState(fname);
        else
                ret = SaveState(fname);
-       free(fname);
 
        return ret;
 }
@@ -455,7 +453,7 @@ static void pnd_menu_init(void)
        char buff[64], *p;
        DIR *dir;
 
-       cpu_clock = get_cpu_clock();
+       cpu_clock_st = cpu_clock = get_cpu_clock();
 
        dir = opendir("/etc/pandora/conf/dss_fir");
        if (dir == NULL) {
@@ -508,6 +506,12 @@ static void pnd_menu_init(void)
        pnd_filter_list = mfilters;
 }
 
+void menu_finish(void)
+{
+       cpu_clock = cpu_clock_st;
+       apply_cpu_clock();
+}
+
 // -------------- key config --------------
 
 me_bind_action me_ctrl_actions[] =
@@ -634,13 +638,13 @@ static int menu_loop_cscaler(int id, int keys)
        scaling = SCALE_CUSTOM;
 
        omap_enable_layer(1);
-       //pnd_restore_layer_data();
 
        for (;;)
        {
                menu_draw_begin(0);
-               memset(g_menuscreen_ptr, 0, g_menuscreen_w * g_menuscreen_h * 2);
-               text_out16(2, 480 - 18, "%dx%d | d-pad to resize, R+d-pad to move", g_layer_w, g_layer_h);
+               memset(g_menuscreen_ptr, 4, g_menuscreen_w * g_menuscreen_h * 2);
+               text_out16(2, 2, "%d,%d", g_layer_x, g_layer_y);
+               text_out16(2, 480 - 18, "%dx%d | d-pad: resize, R+d-pad: move", g_layer_w, g_layer_h);
                menu_draw_end();
 
                inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|PBTN_R|PBTN_MOK|PBTN_MBACK, 40);
@@ -897,7 +901,7 @@ const char *plat_get_credits(void)
                "  and the P.E.Op.S. team\n"
                "ARM recompiler (C) 2009-2010 Ari64\n\n"
                "integration, optimization and\n"
-               "  frontend (C) 2010 notaz\n";
+               "  frontend (C) 2010-2011 notaz\n";
 }
 
 static int run_cd_image(const char *fname)
@@ -914,6 +918,7 @@ static int run_cd_image(const char *fname)
                me_update_msg("failed to open plugins");
                return -1;
        }
+       plugin_call_rearmed_cbs();
 
        if (CheckCdrom() == -1) {
                // Only check the CD if we are starting the console with a CD
@@ -1217,7 +1222,6 @@ void menu_prepare_emu(void)
        }
 
        if (GPU_open != NULL) {
-               extern unsigned long gpuDisp;
                int ret = GPU_open(&gpuDisp, "PCSX", NULL);
                if (ret)
                        fprintf(stderr, "Warning: GPU_open returned %d\n", ret);