cue support wip

[libpicofe.git] / gp2x / menu.c

diff --git a/gp2x/menu.c b/gp2x/menu.c
index 06c0afb..af7397e 100644 (file)
--- a/gp2x/menu.c
+++ b/gp2x/menu.c
@@ -30,7 +30,7 @@
 \r
 extern int  mmuhack_status;\r
 \r
-const char *keyNames[] = {\r
+const char * const keyNames[] = {\r
        "UP",    "???",    "LEFT", "???",  "DOWN", "???", "RIGHT",    "???",\r
        "START", "SELECT", "L",    "R",    "A",    "B",   "X",        "Y",\r
        "???",   "???",    "???",  "???",  "???",  "???", "VOL DOWN", "VOL UP",\r
@@ -200,7 +200,7 @@ void menu_romload_end(void)
 static unsigned short file2color(const char *fname)\r
 {\r
        const char *ext = fname + strlen(fname) - 3;\r
-       static const char *rom_exts[]   = { "zip", "bin", "smd", "gen", "iso", "cso" };\r
+       static const char *rom_exts[]   = { "zip", "bin", "smd", "gen", "iso", "cso", "cue" };\r
        static const char *other_exts[] = { "gmv", "pat" };\r
        int i;\r
 \r
@@ -256,7 +256,7 @@ static int scandir_cmp(const void *p1, const void *p2)
 \r
 static char *filter_exts[] = {\r
        ".mp3", ".MP3", ".srm", ".brm", "s.gz", ".mds", "bcfg", ".txt", ".htm", "html",\r
-       ".jpg", ".gpe", ".cue"\r
+       ".jpg", ".gpe"\r
 };\r
 \r
 static int scandir_filter(const struct dirent *ent)\r
@@ -553,7 +553,7 @@ static void draw_savestate_bg(int slot)
        }\r
 \r
        if (file) {\r
-               if (PicoMCD & 1) {\r
+               if (PicoAHW & PAHW_MCD) {\r
                        PicoCdLoadStateGfx(file);\r
                } else {\r
                        areaSeek(file, 0x10020, SEEK_SET);  // skip header and RAM in state file\r
@@ -878,7 +878,7 @@ static void kc_sel_loop(void)
 {\r
        int menu_sel = 3, menu_sel_max = 3;\r
        unsigned long inp = 0;\r
-       int is_6button = PicoOpt & 0x020;\r
+       int is_6button = PicoOpt & POPT_6BTN_PAD;\r
 \r
        while (1)\r
        {\r
@@ -918,8 +918,8 @@ menu_entry cdopt_entries[] =
        { "done",                      MB_NONE,  MA_CDOPT_DONE,         NULL, 0, 0, 0, 1, 0 },\r
 };\r
 \r
-const int cdopt_entry_count = (sizeof(cdopt_entries) / sizeof(cdopt_entries[0]));\r
 #define CDOPT_ENTRY_COUNT (sizeof(cdopt_entries) / sizeof(cdopt_entries[0]))\r
+const int cdopt_entry_count = CDOPT_ENTRY_COUNT;\r
 \r
 \r
 struct bios_names_t\r
@@ -1059,10 +1059,10 @@ menu_entry opt2_entries[] =
        { NULL,                        MB_NONE,  MA_OPT2_GAMMA,         NULL, 0, 0, 0, 1, 1 },\r
        { "A_SN's gamma curve",        MB_ONOFF, MA_OPT2_A_SN_GAMMA,    &currentConfig.EmuOpt, 0x1000, 0, 0, 1, 1 },\r
        { "Perfect vsync",             MB_ONOFF, MA_OPT2_VSYNC,         &currentConfig.EmuOpt, 0x2000, 0, 0, 1, 1 },\r
+       { "Disable sprite limit",      MB_ONOFF, MA_OPT2_NO_SPRITE_LIM, &PicoOpt, 0x40000, 0, 0, 1, 1 },\r
        { "Emulate Z80",               MB_ONOFF, MA_OPT2_ENABLE_Z80,    &PicoOpt, 0x00004, 0, 0, 1, 1 },\r
        { "Emulate YM2612 (FM)",       MB_ONOFF, MA_OPT2_ENABLE_YM2612, &PicoOpt, 0x00001, 0, 0, 1, 1 },\r
        { "Emulate SN76496 (PSG)",     MB_ONOFF, MA_OPT2_ENABLE_SN76496,&PicoOpt, 0x00002, 0, 0, 1, 1 },\r
-       { "Disable sprite limit",      MB_ONOFF, MA_OPT2_NO_SPRITE_LIM, &PicoOpt, 0x40000, 0, 0, 1, 1 },\r
        { "gzip savestates",           MB_ONOFF, MA_OPT2_GZIP_STATES,   &currentConfig.EmuOpt, 0x0008, 0, 0, 1, 1 },\r
        { "Don't save last used ROM",  MB_ONOFF, MA_OPT2_NO_LAST_ROM,   &currentConfig.EmuOpt, 0x0020, 0, 0, 1, 1 },\r
        { "needs restart:",            MB_NONE,  MA_NONE,               NULL, 0, 0, 0, 1, 0 },\r
@@ -1073,7 +1073,7 @@ menu_entry opt2_entries[] =
 };\r
 \r
 #define OPT2_ENTRY_COUNT (sizeof(opt2_entries) / sizeof(opt2_entries[0]))\r
-const int opt2_entry_count = (sizeof(opt2_entries) / sizeof(opt2_entries[0]));\r
+const int opt2_entry_count = OPT2_ENTRY_COUNT;\r
 \r
 static void menu_opt2_cust_draw(const menu_entry *entry, int x, int y, void *param)\r
 {\r
@@ -1174,7 +1174,7 @@ static void menu_opt_cust_draw(const menu_entry *entry, int x, int y, void *para
        switch (entry->id)\r
        {\r
                case MA_OPT_RENDERER:\r
-                       if (PicoOpt&0x10)\r
+                       if (PicoOpt & POPT_ALT_RENDERER)\r
                                str = " 8bit fast";\r
                        else if (currentConfig.EmuOpt&0x80)\r
                                str = "16bit accurate";\r
@@ -1198,7 +1198,7 @@ static void menu_opt_cust_draw(const menu_entry *entry, int x, int y, void *para
                        text_out16(x, y, "Frameskip                  %s", str24);\r
                        break;\r
                case MA_OPT_SOUND_QUALITY:\r
-                       str = (PicoOpt&0x08)?"stereo":"mono";\r
+                       str = (PicoOpt & POPT_EN_STEREO) ? "stereo" : "mono";\r
                        text_out16(x, y, "Sound Quality:     %5iHz %s", PsndRate, str);\r
                        break;\r
                case MA_OPT_REGION:\r
@@ -1288,7 +1288,7 @@ static void menu_options_save(void)
                // force setting possibly changed..\r
                Pico.m.pal = (PicoRegionOverride == 2 || PicoRegionOverride == 8) ? 1 : 0;\r
        }\r
-       if (!(PicoOpt & 0x20)) {\r
+       if (!(PicoOpt & POPT_6BTN_PAD)) {\r
                // unbind XYZ MODE, just in case\r
                unbind_action(0xf00, -1, -1);\r
        }\r
@@ -1425,7 +1425,7 @@ static void draw_menu_credits(void)
        int tl_x = 15, tl_y = 64, y;\r
        gp2x_pd_clone_buffer2();\r
 \r
-       text_out16(tl_x, 20, "PicoDrive v" VERSION " (c) notaz, 2006,2007");\r
+       text_out16(tl_x, 20, "PicoDrive v" VERSION " (c) notaz, 2006-2008");\r
        y = tl_y;\r
        text_out16(tl_x, y, "Credits:");\r
        text_out16(tl_x, (y+=10), "fDave: Cyclone 68000 core,");\r
@@ -1724,10 +1724,11 @@ int menu_loop_tray(void)
                                case 0: // select image\r
                                        selfname = romsel_loop(curr_path);\r
                                        if (selfname) {\r
-                                               int ret = -1, cd_type;\r
+                                               int ret = -1;\r
+                                               cd_img_type cd_type;\r
                                                cd_type = emu_cdCheck(NULL);\r
-                                               if (cd_type > 0)\r
-                                                       ret = Insert_CD(romFileName, cd_type == 2);\r
+                                               if (cd_type != CIT_NOT_CD)\r
+                                                       ret = Insert_CD(romFileName, cd_type);\r
                                                if (ret != 0) {\r
                                                        sprintf(menuErrorMsg, "Load failed, invalid CD image?");\r
                                                        printf("%s\n", menuErrorMsg);\r