frontend: support analog controller using nubs; some refactoring

[pcsx_rearmed.git] / frontend / menu.c

diff --git a/frontend/menu.c b/frontend/menu.c
index af35119..0a4c271 100644 (file)
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -22,7 +22,7 @@
 #include "omap.h"
 #include "common/plat.h"
 #include "../libpcsxcore/misc.h"
-#include "../libpcsxcore/new_dynarec/new_dynarec.h"
+#include "../libpcsxcore/psemu_plugin_defs.h"
 #include "revision.h"
 
 #define MENU_X2 1
@@ -63,6 +63,7 @@ static int last_psx_w, last_psx_h, last_psx_bpp;
 static int scaling, filter, state_slot, cpu_clock, cpu_clock_st;
 static char rom_fname_reload[MAXPATHLEN];
 static char last_selected_fname[MAXPATHLEN];
+static int region, in_type_sel;
 int g_opts;
 
 // from softgpu plugin
@@ -138,21 +139,42 @@ static int emu_save_load_game(int load, int sram)
        return ret;
 }
 
+// propagate menu settings to the emu vars
+static void menu_sync_config(void)
+{
+       Config.PsxAuto = 1;
+       if (region > 0) {
+               Config.PsxAuto = 0;
+               Config.PsxType = region - 1;
+       }
+       in_type = in_type_sel ? PSE_PAD_TYPE_ANALOGPAD : PSE_PAD_TYPE_STANDARD;
+
+       pl_frame_interval = Config.PsxType ? 20000 : 16667;
+       // used by P.E.Op.S. frameskip code
+       fFrameRateHz = Config.PsxType ? 50.0f : 59.94f;
+       dwFrameRateTicks = (100000*100 / (unsigned long)(fFrameRateHz*100));
+}
+
 static void menu_set_defconfig(void)
 {
        g_opts = 0;
        scaling = SCALE_4_3;
 
+       region = 0;
+       in_type_sel = 0;
        Config.Xa = Config.Cdda = Config.Sio =
        Config.SpuIrq = Config.RCntFix = Config.VSyncWA = 0;
 
-       iUseDither = UseFrameSkip = 0;
+       iUseDither = 0;
+       UseFrameSkip = 1;
        dwActFixes = 1<<7;
 
        iUseReverb = 2;
        iUseInterpolation = 1;
        iXAPitch = iSPUIRQWait = 0;
        iUseTimer = 2;
+
+       menu_sync_config();
 }
 
 #define CE_CONFIG_STR(val) \
@@ -179,7 +201,6 @@ static const struct {
        CE_CONFIG_VAL(Xa),
        CE_CONFIG_VAL(Sio),
        CE_CONFIG_VAL(Mdec),
-       CE_CONFIG_VAL(PsxAuto),
        CE_CONFIG_VAL(Cdda),
        CE_CONFIG_VAL(Debug),
        CE_CONFIG_VAL(PsxOut),
@@ -187,7 +208,7 @@ static const struct {
        CE_CONFIG_VAL(RCntFix),
        CE_CONFIG_VAL(VSyncWA),
        CE_CONFIG_VAL(Cpu),
-       CE_CONFIG_VAL(PsxType),
+       CE_INTVAL(region),
        CE_INTVAL(scaling),
        CE_INTVAL(g_layer_x),
        CE_INTVAL(g_layer_y),
@@ -197,6 +218,7 @@ static const struct {
        CE_INTVAL(state_slot),
        CE_INTVAL(cpu_clock),
        CE_INTVAL(g_opts),
+       CE_INTVAL(in_type_sel),
        CE_INTVAL(iUseDither),
        CE_INTVAL(UseFrameSkip),
        CE_INTVAL(dwActFixes),
@@ -363,6 +385,8 @@ static int menu_load_config(int is_game)
                }
        }
 
+       menu_sync_config();
+
        // sync plugins
        for (i = bios_sel = 0; bioses[i] != NULL; i++)
                if (strcmp(Config.Bios, bioses[i]) == 0)
@@ -691,13 +715,17 @@ static int mh_savecfg(int id, int keys)
        return 1;
 }
 
+static const char *men_in_type_sel[] = { "Standard (SCPH-1080)", "Analog (SCPH-1150)", NULL };
+
 static menu_entry e_menu_keyconfig[] =
 {
        mee_handler_id("Player 1",          MA_CTRL_PLAYER1,    key_config_loop_wrap),
        mee_handler_id("Player 2",          MA_CTRL_PLAYER2,    key_config_loop_wrap),
        mee_handler_id("Emulator controls", MA_CTRL_EMU,        key_config_loop_wrap),
-//     mee_cust_nosave("Save global config",       MA_OPT_SAVECFG, mh_savecfg, mgn_saveloadcfg),
-//     mee_cust_nosave("Save cfg for loaded game", MA_OPT_SAVECFG_GAME, mh_savecfg, mgn_saveloadcfg),
+       mee_label     (""),
+       mee_enum      ("Controller",        0, in_type_sel,     men_in_type_sel),
+       mee_cust_nosave("Save global config",       MA_OPT_SAVECFG,      mh_savecfg, mgn_saveloadcfg),
+       mee_cust_nosave("Save cfg for loaded game", MA_OPT_SAVECFG_GAME, mh_savecfg, mgn_saveloadcfg),
        mee_label     (""),
        mee_label     ("Input devices:"),
        mee_label_mk  (MA_CTRL_DEV_FIRST, mgn_dev_name),
@@ -929,7 +957,7 @@ static int mh_restore_defaults(int id, int keys)
        return 1;
 }
 
-static const char *men_region[]       = { "NTSC", "PAL", NULL };
+static const char *men_region[]       = { "Auto", "NTSC", "PAL", NULL };
 /*
 static const char *men_confirm_save[] = { "OFF", "writes", "loads", "both", NULL };
 static const char h_confirm_save[]    = "Ask for confirmation when overwriting save,\n"
@@ -944,7 +972,7 @@ static menu_entry e_menu_options[] =
 //     mee_enum_h    ("Confirm savestate",        0, dummy, men_confirm_save, h_confirm_save),
        mee_onoff     ("Frameskip",                0, UseFrameSkip, 1),
        mee_onoff     ("Show FPS",                 0, g_opts, OPT_SHOWFPS),
-       mee_enum      ("Region",                   0, Config.PsxType, men_region),
+       mee_enum      ("Region",                   0, region, men_region),
        mee_range     ("CPU clock",                MA_OPT_CPU_CLOCKS, cpu_clock, 20, 5000),
        mee_handler   ("[Display]",                menu_loop_gfx_options),
        mee_handler   ("[BIOS/Plugins]",           menu_loop_plugin_options),
@@ -1001,7 +1029,8 @@ static void draw_frame_main(void)
 {
        if (CdromId[0] != 0) {
                char buff[64];
-               snprintf(buff, sizeof(buff), "%.32s/%.9s", get_cd_label(), CdromId);
+               snprintf(buff, sizeof(buff), "%.32s/%.9s (running as %s)",
+                        get_cd_label(), CdromId, Config.PsxType ? "PAL" : "NTSC");
                smalltext_out16(4, 1, buff, 0x105f);
        }
 }
@@ -1016,10 +1045,10 @@ const char *plat_get_credits(void)
        return  "PCSX-ReARMed\n\n"
                "(C) 1999-2003 PCSX Team\n"
                "(C) 2005-2009 PCSX-df Team\n"
-               "(C) 2009-2010 PCSX-Reloaded Team\n\n"
+               "(C) 2009-2011 PCSX-Reloaded Team\n\n"
                "GPU and SPU code by Pete Bernert\n"
                "  and the P.E.Op.S. team\n"
-               "ARM recompiler (C) 2009-2010 Ari64\n"
+               "ARM recompiler (C) 2009-2011 Ari64\n"
                "PCSX4ALL plugins by PCSX4ALL team\n"
                "  Chui, Franxis, Unai\n\n"
                "integration, optimization and\n"
@@ -1413,7 +1442,6 @@ void menu_prepare_emu(void)
        }
        apply_filter(filter);
        apply_cpu_clock();
-       stop = 0;
 
        psxCpu = (Config.Cpu == CPU_INTERPRETER) ? &psxInt : &psxRec;
        if (psxCpu != prev_cpu)
@@ -1425,7 +1453,7 @@ void menu_prepare_emu(void)
        if (Config.Cdda)
                CDR_stop();
 
-       pl_frame_interval = Config.PsxType ? 20000 : 16667;
+       menu_sync_config();
 
        if (GPU_open != NULL) {
                int ret = GPU_open(&gpuDisp, "PCSX", NULL);