return alphasort(d1, d2);\r
}\r
\r
-static char *filter_exts[] = { ".mp3", ".MP3", ".srm", ".brm", "s.gz", ".mds", "bcfg", ".txt", ".htm", "html", ".jpg", ".gpe" };\r
+static char *filter_exts[] = {\r
+ ".mp3", ".MP3", ".srm", ".brm", "s.gz", ".mds", "bcfg", ".txt", ".htm", "html",\r
+ ".jpg", ".gpe", ".cue"\r
+};\r
\r
static int scandir_filter(const struct dirent *ent)\r
{\r
//memset(gp2x_screen, 0, 320*240);\r
gp2x_pd_clone_buffer2();\r
\r
- gp2x_text_out8(tl_x, y, "Scale 32 column mode %s", (currentConfig.PicoOpt&0x100)?"ON":"OFF"); // 0\r
- gp2x_text_out8(tl_x, (y+=10), "Gamma correction %i.%02i", currentConfig.gamma / 100, currentConfig.gamma%100); // 1\r
- gp2x_text_out8(tl_x, (y+=10), "Emulate Z80 %s", (currentConfig.PicoOpt&0x004)?"ON":"OFF"); // 2\r
- gp2x_text_out8(tl_x, (y+=10), "Emulate YM2612 (FM) %s", (currentConfig.PicoOpt&0x001)?"ON":"OFF"); // 3\r
- gp2x_text_out8(tl_x, (y+=10), "Emulate SN76496 (PSG) %s", (currentConfig.PicoOpt&0x002)?"ON":"OFF"); // 4\r
- gp2x_text_out8(tl_x, (y+=10), "gzip savestates %s", (currentConfig.EmuOpt &0x008)?"ON":"OFF"); // 5\r
- gp2x_text_out8(tl_x, (y+=10), "Don't save config on exit %s", (currentConfig.EmuOpt &0x020)?"ON":"OFF"); // 6\r
+ gp2x_text_out8(tl_x, y, "Gamma correction %i.%02i", currentConfig.gamma / 100, currentConfig.gamma%100); // 0\r
+ gp2x_text_out8(tl_x, (y+=10), "Emulate Z80 %s", (currentConfig.PicoOpt&0x004)?"ON":"OFF"); // 1\r
+ gp2x_text_out8(tl_x, (y+=10), "Emulate YM2612 (FM) %s", (currentConfig.PicoOpt&0x001)?"ON":"OFF"); // 2\r
+ gp2x_text_out8(tl_x, (y+=10), "Emulate SN76496 (PSG) %s", (currentConfig.PicoOpt&0x002)?"ON":"OFF"); // 3\r
+ gp2x_text_out8(tl_x, (y+=10), "gzip savestates %s", (currentConfig.EmuOpt &0x008)?"ON":"OFF"); // 4\r
+ gp2x_text_out8(tl_x, (y+=10), "Don't save config on exit %s", (currentConfig.EmuOpt &0x020)?"ON":"OFF"); // 5\r
gp2x_text_out8(tl_x, (y+=10), "needs restart:");\r
- gp2x_text_out8(tl_x, (y+=10), "craigix's RAM timings %s", (currentConfig.EmuOpt &0x100)?"ON":"OFF"); // 8\r
- gp2x_text_out8(tl_x, (y+=10), "squidgehack (now %s %s", mms, (currentConfig.EmuOpt &0x010)?"ON":"OFF"); // 9\r
+ gp2x_text_out8(tl_x, (y+=10), "craigix's RAM timings %s", (currentConfig.EmuOpt &0x100)?"ON":"OFF"); // 7\r
+ gp2x_text_out8(tl_x, (y+=10), "squidgehack (now %s %s", mms, (currentConfig.EmuOpt &0x010)?"ON":"OFF"); // 8\r
gp2x_text_out8(tl_x, (y+=10), "Done");\r
\r
// draw cursor\r
\r
static void amenu_loop_options(void)\r
{\r
- int menu_sel = 0, menu_sel_max = 10;\r
+ int menu_sel = 0, menu_sel_max = 9;\r
unsigned long inp = 0;\r
\r
for(;;)\r
if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }\r
if((inp& GP2X_B)||(inp&GP2X_LEFT)||(inp&GP2X_RIGHT)) { // toggleable options\r
switch (menu_sel) {\r
- case 0: currentConfig.PicoOpt^=0x100; break;\r
- case 2: currentConfig.PicoOpt^=0x004; break;\r
- case 3: currentConfig.PicoOpt^=0x001; break;\r
- case 4: currentConfig.PicoOpt^=0x002; break;\r
- case 5: currentConfig.EmuOpt ^=0x008; break;\r
- case 6: currentConfig.EmuOpt ^=0x020; break;\r
- case 8: currentConfig.EmuOpt ^=0x100; break;\r
- case 9: currentConfig.EmuOpt ^=0x010; break;\r
- case 10: return;\r
+ case 1: currentConfig.PicoOpt^=0x004; break;\r
+ case 2: currentConfig.PicoOpt^=0x001; break;\r
+ case 3: currentConfig.PicoOpt^=0x002; break;\r
+ case 4: currentConfig.EmuOpt ^=0x008; break;\r
+ case 5: currentConfig.EmuOpt ^=0x020; break;\r
+ case 7: currentConfig.EmuOpt ^=0x100; break;\r
+ case 8: currentConfig.EmuOpt ^=0x010; break;\r
+ case 9: return;\r
}\r
}\r
if(inp & (GP2X_X|GP2X_A)) return;\r
if(inp & (GP2X_LEFT|GP2X_RIGHT)) { // multi choise\r
switch (menu_sel) {\r
- case 1:\r
+ case 0:\r
while ((inp = gp2x_joystick_read(1)) & (GP2X_LEFT|GP2X_RIGHT)) {\r
currentConfig.gamma += (inp & GP2X_LEFT) ? -1 : 1;\r
if (currentConfig.gamma < 1) currentConfig.gamma = 1;\r
\r
static void draw_menu_options(int menu_sel)\r
{\r
- int tl_x = 25, tl_y = 40, y;\r
- char monostereo[8], strframeskip[8], *strrend;\r
+ int tl_x = 25, tl_y = 32, y;\r
+ char monostereo[8], strframeskip[8], *strrend, *strscaling;\r
\r
strcpy(monostereo, (currentConfig.PicoOpt&0x08)?"stereo":"mono");\r
if (currentConfig.Frameskip < 0)\r
} else {\r
strrend = " 8bit accurate";\r
}\r
+ switch (currentConfig.scaling) {\r
+ default: strscaling = " OFF"; break;\r
+ case 1: strscaling = "hw horizontal"; break;\r
+ case 2: strscaling = "hw horiz. + vert."; break;\r
+ case 3: strscaling = "sw horizontal"; break;\r
+ }\r
\r
y = tl_y;\r
//memset(gp2x_screen, 0, 320*240);\r
gp2x_pd_clone_buffer2();\r
\r
gp2x_text_out8(tl_x, y, "Renderer: %s", strrend); // 0\r
- gp2x_text_out8(tl_x, (y+=10), "Accurate timing (slower) %s", (currentConfig.PicoOpt&0x040)?"ON":"OFF"); // 1\r
- gp2x_text_out8(tl_x, (y+=10), "Accurate sprites (slower) %s", (currentConfig.PicoOpt&0x080)?"ON":"OFF"); // 2\r
- gp2x_text_out8(tl_x, (y+=10), "Show FPS %s", (currentConfig.EmuOpt &0x002)?"ON":"OFF"); // 3\r
+ gp2x_text_out8(tl_x, (y+=10), "Scaling: %s", strscaling); // 1\r
+ gp2x_text_out8(tl_x, (y+=10), "Accurate timing (slower) %s", (currentConfig.PicoOpt&0x040)?"ON":"OFF"); // 2\r
+ gp2x_text_out8(tl_x, (y+=10), "Accurate sprites (slower) %s", (currentConfig.PicoOpt&0x080)?"ON":"OFF"); // 3\r
+ gp2x_text_out8(tl_x, (y+=10), "Show FPS %s", (currentConfig.EmuOpt &0x002)?"ON":"OFF"); // 4\r
gp2x_text_out8(tl_x, (y+=10), "Frameskip %s", strframeskip);\r
- gp2x_text_out8(tl_x, (y+=10), "Enable sound %s", (currentConfig.EmuOpt &0x004)?"ON":"OFF"); // 5\r
+ gp2x_text_out8(tl_x, (y+=10), "Enable sound %s", (currentConfig.EmuOpt &0x004)?"ON":"OFF"); // 6\r
gp2x_text_out8(tl_x, (y+=10), "Sound Quality: %5iHz %s", currentConfig.PsndRate, monostereo);\r
- gp2x_text_out8(tl_x, (y+=10), "Use ARM940 core for sound %s", (currentConfig.PicoOpt&0x200)?"ON":"OFF"); // 7\r
- gp2x_text_out8(tl_x, (y+=10), "6 button pad %s", (currentConfig.PicoOpt&0x020)?"ON":"OFF"); // 8\r
+ gp2x_text_out8(tl_x, (y+=10), "Use ARM940 core for sound %s", (currentConfig.PicoOpt&0x200)?"ON":"OFF"); // 8\r
+ gp2x_text_out8(tl_x, (y+=10), "6 button pad %s", (currentConfig.PicoOpt&0x020)?"ON":"OFF"); // 9\r
gp2x_text_out8(tl_x, (y+=10), "Genesis Region: %s", region_name(currentConfig.PicoRegion));\r
- gp2x_text_out8(tl_x, (y+=10), "Use SRAM/BRAM savestates %s", (currentConfig.EmuOpt &0x001)?"ON":"OFF"); // 10\r
- gp2x_text_out8(tl_x, (y+=10), "Confirm save overwrites %s", (currentConfig.EmuOpt &0x200)?"ON":"OFF"); // 11\r
- gp2x_text_out8(tl_x, (y+=10), "Save slot %i", state_slot); // 12\r
+ gp2x_text_out8(tl_x, (y+=10), "Use SRAM/BRAM savestates %s", (currentConfig.EmuOpt &0x001)?"ON":"OFF"); // 11\r
+ gp2x_text_out8(tl_x, (y+=10), "Confirm save overwrites %s", (currentConfig.EmuOpt &0x200)?"ON":"OFF"); // 12\r
+ gp2x_text_out8(tl_x, (y+=10), "Save slot %i", state_slot); // 13\r
gp2x_text_out8(tl_x, (y+=10), "GP2X CPU clocks %iMhz", currentConfig.CPUclock);\r
gp2x_text_out8(tl_x, (y+=10), "[Sega/Mega CD options]");\r
- gp2x_text_out8(tl_x, (y+=10), "[advanced options]"); // 15\r
+ gp2x_text_out8(tl_x, (y+=10), "[advanced options]"); // 16\r
gp2x_text_out8(tl_x, (y+=10), "Save cfg as default");\r
if (rom_data)\r
gp2x_text_out8(tl_x, (y+=10), "Save cfg for current game only");\r
} else {\r
actionNames[8] = actionNames[9] = actionNames[10] = actionNames[11] = 0;\r
}\r
+ scaling_update();\r
}\r
\r
static int menu_loop_options(void)\r
{\r
- int menu_sel = 0, menu_sel_max = 16;\r
+ int menu_sel = 0, menu_sel_max = 17;\r
unsigned long inp = 0;\r
\r
if (rom_data) menu_sel_max++;\r
if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }\r
if((inp& GP2X_B)||(inp&GP2X_LEFT)||(inp&GP2X_RIGHT)) { // toggleable options\r
switch (menu_sel) {\r
- case 1: currentConfig.PicoOpt^=0x040; break;\r
- case 2: currentConfig.PicoOpt^=0x080; break;\r
- case 3: currentConfig.EmuOpt ^=0x002; break;\r
- case 5: currentConfig.EmuOpt ^=0x004; break;\r
- case 7: currentConfig.PicoOpt^=0x200; break;\r
- case 8: currentConfig.PicoOpt^=0x020; break;\r
- case 10: currentConfig.EmuOpt ^=0x001; break;\r
- case 11: currentConfig.EmuOpt ^=0x200; break;\r
- case 14: cd_menu_loop_options();\r
+ case 2: currentConfig.PicoOpt^=0x040; break;\r
+ case 3: currentConfig.PicoOpt^=0x080; break;\r
+ case 4: currentConfig.EmuOpt ^=0x002; break;\r
+ case 6: currentConfig.EmuOpt ^=0x004; break;\r
+ case 8: currentConfig.PicoOpt^=0x200; break;\r
+ case 9: currentConfig.PicoOpt^=0x020; break;\r
+ case 11: currentConfig.EmuOpt ^=0x001; break;\r
+ case 12: currentConfig.EmuOpt ^=0x200; break;\r
+ case 15: cd_menu_loop_options();\r
if (engineState == PGS_ReloadRom)\r
return 0; // test BIOS\r
break;\r
- case 15: amenu_loop_options(); break;\r
- case 16: // done (update and write)\r
+ case 16: amenu_loop_options(); break;\r
+ case 17: // done (update and write)\r
menu_options_save();\r
if (emu_WriteConfig(0)) strcpy(menuErrorMsg, "config saved");\r
else strcpy(menuErrorMsg, "failed to write config");\r
return 1;\r
- case 17: // done (update and write for current game)\r
+ case 18: // done (update and write for current game)\r
menu_options_save();\r
if (emu_WriteConfig(1)) strcpy(menuErrorMsg, "config saved");\r
else strcpy(menuErrorMsg, "failed to write config");\r
else if ( currentConfig.EmuOpt &0x80) currentConfig.EmuOpt &= ~0x80;\r
}\r
break;\r
- case 4:\r
+ case 1:\r
+ currentConfig.scaling += (inp & GP2X_LEFT) ? -1 : 1;\r
+ if (currentConfig.scaling < 0) currentConfig.scaling = 0;\r
+ if (currentConfig.scaling > 3) currentConfig.scaling = 3;\r
+ break;\r
+ case 5:\r
currentConfig.Frameskip += (inp & GP2X_LEFT) ? -1 : 1;\r
if (currentConfig.Frameskip < 0) currentConfig.Frameskip = -1;\r
if (currentConfig.Frameskip > 32) currentConfig.Frameskip = 32;\r
break;\r
- case 6:\r
+ case 7:\r
if ((inp & GP2X_RIGHT) && currentConfig.PsndRate == 44100 && !(currentConfig.PicoOpt&0x08)) {\r
currentConfig.PsndRate = 8000; currentConfig.PicoOpt|= 0x08;\r
} else if ((inp & GP2X_LEFT) && currentConfig.PsndRate == 8000 && (currentConfig.PicoOpt&0x08)) {\r
currentConfig.PsndRate = 44100; currentConfig.PicoOpt&=~0x08;\r
} else currentConfig.PsndRate = sndrate_prevnext(currentConfig.PsndRate, inp & GP2X_RIGHT);\r
break;\r
- case 9:\r
+ case 10:\r
region_prevnext(inp & GP2X_RIGHT);\r
break;\r
- case 12:\r
+ case 13:\r
if (inp & GP2X_RIGHT) {\r
state_slot++; if (state_slot > 9) state_slot = 0;\r
} else {state_slot--; if (state_slot < 0) state_slot = 9;\r
}\r
break;\r
- case 13:\r
+ case 14:\r
while ((inp = gp2x_joystick_read(1)) & (GP2X_LEFT|GP2X_RIGHT)) {\r
currentConfig.CPUclock += (inp & GP2X_LEFT) ? -1 : 1;\r
if (currentConfig.CPUclock < 1) currentConfig.CPUclock = 1;\r
if (rom_data) menu_sel = menu_sel_min = 0;\r
if (PicoPatches) menu_sel_max = 9;\r
\r
- for(;;)\r
+ /* make sure action buttons are not pressed on entering menu */\r
+ draw_menu_root(menu_sel);\r
+ while (gp2x_joystick_read(1) & (GP2X_B|GP2X_X|GP2X_SELECT)) usleep(50*1000);\r
+\r
+ for (;;)\r
{\r
draw_menu_root(menu_sel);\r
inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_B|GP2X_X|GP2X_SELECT);\r
\r
// switch to 8bpp\r
gp2x_video_changemode2(8);\r
- gp2x_video_RGB_setscaling(320, 240);\r
+ gp2x_video_RGB_setscaling(0, 320, 240);\r
gp2x_video_flip2();\r
}\r
\r
notaz.gp2x.de / libpicofe.git / blobdiff