-// (c) Copyright 2006,2007 notaz, All rights reserved.
+// (c) Copyright 2007 notaz, All rights reserved.
// Free for non-commercial use.
// For commercial use, separate licencing terms must be obtained.
#include "psp.h"
#include "emu.h"
#include "menu.h"
+#include "mp3.h"
#include "../common/menu.h"
#include "../common/emu.h"
#include "../common/readpng.h"
// --------- loading ROM screen ----------
+static int lcdr_line = 0;
+
static void load_progress_cb(int percent)
{
int ln, len = percent * 480 / 100;
unsigned short *dst;
- sceDisplayWaitVblankStart();
+ //sceDisplayWaitVblankStart();
+
+ dst = (unsigned short *)menu_screen + 512*10*lcdr_line;
+
+ if (len > 480) len = 480;
+ for (ln = 8; ln > 0; ln--, dst += 512)
+ memset(dst, 0xff, len*2);
+}
+
+static void cdload_progress_cb(int percent)
+{
+ int ln, len = percent * 480 / 100;
+ unsigned short *dst;
+
+ if (lcdr_line <= 2) {
+ lcdr_line++;
+ smalltext_out16(1, lcdr_line++ * 10, "Processing CD image / MP3s", 0xffff);
+ smalltext_out16_lim(1, lcdr_line++ * 10, romFileName, 0xffff, 80);
+ }
- dst = (unsigned short *)menu_screen + 512*20;
+ dst = (unsigned short *)menu_screen + 512*10*lcdr_line;
if (len > 480) len = 480;
- for (ln = 10; ln > 0; ln--, dst += 512)
+ for (ln = 8; ln > 0; ln--, dst += 512)
memset(dst, 0xff, len*2);
}
while (p > rom_name && *p != '/') p--;
psp_video_switch_to_single();
- menu_draw_begin();
+ if (rom_data) menu_draw_begin();
+ else memset32_uncached(psp_screen, 0, 512*272*2/4);
smalltext_out16(1, 1, "Loading", 0xffff);
smalltext_out16_lim(1, 10, p, 0xffff, 80);
PicoCartLoadProgressCB = load_progress_cb;
+ PicoCDLoadProgressCB = cdload_progress_cb;
+ lcdr_line = 2;
}
void menu_romload_end(void)
{
- PicoCartLoadProgressCB = NULL;
- smalltext_out16(1, 30, "Starting emulation...", 0xffff);
+ PicoCartLoadProgressCB = PicoCDLoadProgressCB = NULL;
+ smalltext_out16(1, ++lcdr_line*10, "Starting emulation...", 0xffff);
}
// -------------- ROM selector --------------
}
+static SceIoStat cpstat;
+
static char *romsel_loop(char *curr_path)
{
struct my_dirent **namelist;
int n, iret, sel = 0;
unsigned long inp = 0;
char *ret = NULL, *fname = NULL;
- SceIoStat cpstat;
// is this a dir or a full path?
memset(&cpstat, 0, sizeof(cpstat));
if (iret >= 0 && (cpstat.st_attr & FIO_SO_IFREG)) { // file
char *p;
for (p = curr_path + strlen(curr_path) - 1; p > curr_path && *p != '/'; p--);
- *p = 0;
- fname = p+1;
+ if (p > curr_path) {
+ *p = 0;
+ fname = p+1;
+ }
+ else strcpy(curr_path, "ms0:/");
}
else if (iret >= 0 && (cpstat.st_attr & FIO_SO_IFDIR)); // dir
else strcpy(curr_path, "ms0:/"); // something else
p = start + strlen(start) - 1;
while (*p == '/' && p > start) p--;
while (*p != '/' && *p != ':' && p > start) p--;
- if (p <= start || *p == ':' || p[-1] == ':') strcpy(newdir, "ms0:/");
+ if (p <= start || *p == ':') strcpy(newdir, "ms0:/");
else { strncpy(newdir, start, p-start); newdir[p-start] = 0; }
} else {
strcpy(newdir, curr_path);
static void debug_menu_loop(void)
{
+ int ret = 0;
draw_debug();
- wait_for_input(BTN_X|BTN_CIRCLE, 0);
+ while (!(ret & (BTN_X|BTN_CIRCLE)))
+ ret = wait_for_input(BTN_X|BTN_CIRCLE, 0);
}
// ------------ patch/gg menu ------------
char *bios, *p;
if (emu_findBios(4, &bios)) { // US
- for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); p++;
+ for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--);
+ if (*p == '/') p++;
strncpy(bios_names.us, p, sizeof(bios_names.us)); bios_names.us[sizeof(bios_names.us)-1] = 0;
} else strcpy(bios_names.us, "NOT FOUND");
if (emu_findBios(8, &bios)) { // EU
- for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); p++;
+ for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--);
+ if (*p == '/') p++;
strncpy(bios_names.eu, p, sizeof(bios_names.eu)); bios_names.eu[sizeof(bios_names.eu)-1] = 0;
} else strcpy(bios_names.eu, "NOT FOUND");
if (emu_findBios(1, &bios)) { // JP
- for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); p++;
+ for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--);
+ if (*p == '/') p++;
strncpy(bios_names.jp, p, sizeof(bios_names.jp)); bios_names.jp[sizeof(bios_names.jp)-1] = 0;
} else strcpy(bios_names.jp, "NOT FOUND");
- for(;;)
+ menuErrorMsg[0] = 0;
+
+ for (;;)
{
draw_cd_menu_options(menu_sel, &bios_names);
- inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT|BTN_X|BTN_CIRCLE, 0);
+ inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT|BTN_X|BTN_CIRCLE|BTN_START, 0);
if (inp & BTN_UP ) { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; }
if (inp & BTN_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }
selected_id = me_index2id(cdopt_entries, CDOPT_ENTRY_COUNT, menu_sel);
}
}
}
- if (inp & BTN_CIRCLE) { // toggleable options
+ if (inp & BTN_CIRCLE) // toggleable options
if (!me_process(cdopt_entries, CDOPT_ENTRY_COUNT, selected_id, 1) &&
selected_id == MA_CDOPT_DONE) {
return;
}
+ if (inp & BTN_START) {
switch (selected_id) { // BIOS testers
case MA_CDOPT_TESTBIOS_USA:
if (emu_findBios(4, &bios)) { // test US
{ NULL, MB_ONOFF, MA_OPT3_FILTERING, ¤tConfig.scaling, 1, 0, 0, 1 },
{ NULL, MB_NONE, MA_OPT3_VSYNC, NULL, 0, 0, 0, 1 },
{ "Set to unscaled centered", MB_NONE, MA_OPT3_PRES_NOSCALE, NULL, 0, 0, 0, 1 },
+ { "Set to 4:3 scaled", MB_NONE, MA_OPT3_PRES_SCALE43, NULL, 0, 0, 0, 1 },
{ "Set to fullscreen", MB_NONE, MA_OPT3_PRES_FULLSCR, NULL, 0, 0, 0, 1 },
{ "done", MB_NONE, MA_OPT3_DONE, NULL, 0, 0, 0, 1 },
};
lprintf("uncompress returned %i\n", ret);
}
- memset32(psp_screen, 0, 512*272*2/4);
+ memset32_uncached(psp_screen, 0, 512*272*2/4);
emu_forcedFrame();
menu_prepare_bg(1, 0);
if (setting != NULL) {
while ((inp = psp_pad_read(0)) & (BTN_LEFT|BTN_RIGHT)) {
*setting += (inp & BTN_LEFT) ? -0.01 : 0.01;
+ if (*setting <= 0) *setting = 0.01;
menu_opt3_preview(is_32col);
draw_dispmenu_options(menu_sel); // will wait vsync
}
currentConfig.scale = currentConfig.hscale40 = currentConfig.hscale32 = 1.0;
menu_opt3_preview(is_32col);
break;
+ case MA_OPT3_PRES_SCALE43:
+ currentConfig.scale = 1.20;
+ currentConfig.hscale40 = 1.00;
+ currentConfig.hscale32 = 1.25;
+ menu_opt3_preview(is_32col);
+ break;
case MA_OPT3_PRES_FULLSCR:
currentConfig.scale = 1.20;
currentConfig.hscale40 = 1.25;
menu_entry opt2_entries[] =
{
- { "Emulate Z80", MB_ONOFF, MA_OPT2_ENABLE_Z80, ¤tConfig.PicoOpt,0x00004, 0, 0, 1 },
- { "Emulate YM2612 (FM)", MB_ONOFF, MA_OPT2_ENABLE_YM2612, ¤tConfig.PicoOpt,0x00001, 0, 0, 1 },
- { "Emulate SN76496 (PSG)", MB_ONOFF, MA_OPT2_ENABLE_SN76496,¤tConfig.PicoOpt,0x00002, 0, 0, 1 },
- { "gzip savestates", MB_ONOFF, MA_OPT2_GZIP_STATES, ¤tConfig.EmuOpt, 0x00008, 0, 0, 1 },
- { "Don't save last used ROM", MB_ONOFF, MA_OPT2_NO_LAST_ROM, ¤tConfig.EmuOpt, 0x00020, 0, 0, 1 },
- { "Status line in main menu", MB_ONOFF, MA_OPT2_STATUS_LINE, ¤tConfig.EmuOpt, 0x20000, 0, 0, 1 },
- { "done", MB_NONE, MA_OPT2_DONE, NULL, 0, 0, 0, 1 },
+ { "Emulate Z80", MB_ONOFF, MA_OPT2_ENABLE_Z80, ¤tConfig.PicoOpt,0x00004, 0, 0, 1 },
+ { "Emulate YM2612 (FM)", MB_ONOFF, MA_OPT2_ENABLE_YM2612, ¤tConfig.PicoOpt,0x00001, 0, 0, 1 },
+ { "Emulate SN76496 (PSG)", MB_ONOFF, MA_OPT2_ENABLE_SN76496, ¤tConfig.PicoOpt,0x00002, 0, 0, 1 },
+ { "gzip savestates", MB_ONOFF, MA_OPT2_GZIP_STATES, ¤tConfig.EmuOpt, 0x00008, 0, 0, 1 },
+ { "Don't save last used ROM", MB_ONOFF, MA_OPT2_NO_LAST_ROM, ¤tConfig.EmuOpt, 0x00020, 0, 0, 1 },
+ { "Status line in main menu", MB_ONOFF, MA_OPT2_STATUS_LINE, ¤tConfig.EmuOpt, 0x20000, 0, 0, 1 },
+ { "Disable frame limitter", MB_ONOFF, MA_OPT2_NO_FRAME_LIMIT, ¤tConfig.EmuOpt, 0x40000, 0, 0, 1 },
+ { "done", MB_NONE, MA_OPT2_DONE, NULL, 0, 0, 0, 1 },
};
#define OPT2_ENTRY_COUNT (sizeof(opt2_entries) / sizeof(opt2_entries[0]))
menu_sel_max = me_count_enabled(main_entries, MAIN_ENTRY_COUNT) - 1;
if (menu_sel > menu_sel_max) menu_sel = menu_sel_max;
+ // mp3 errors?
+ if (mp3_last_error != 0) {
+ if (mp3_last_error == -1)
+ sprintf(menuErrorMsg, "Unsupported mp3 format, use 44kHz stereo");
+ else sprintf(menuErrorMsg, "mp3 init failed, code %08x", mp3_last_error);
+ mp3_last_error = 0;
+ }
+
/* make sure action buttons are not pressed on entering menu */
draw_menu_root(menu_sel);
}
}
if(inp & BTN_CIRCLE) {
+ menuErrorMsg[0] = 0; // clear error msg
switch (me_index2id(main_entries, MAIN_ENTRY_COUNT, menu_sel))
{
case MA_MAIN_RESUME_GAME:
break;
}
}
- menuErrorMsg[0] = 0; // clear error msg
}
}
int i;
for (i = 272; i > 0; i--, dst += 480, src += 512)
menu_darken_bg(dst, src, 480, 1);
- //memset32((int *)(bg_buffer + 480*264), 0, 480*8*2/4);
+ //memset32_uncached((int *)(bg_buffer + 480*264), 0, 480*8*2/4);
}
else
{
// should really only happen once, on startup..
- memset32((int *)(void *)bg_buffer, 0, sizeof(bg_buffer)/4);
+ memset32_uncached((int *)(void *)bg_buffer, 0, sizeof(bg_buffer)/4);
readpng(bg_buffer, "skin/background.png", READPNG_BG);
}
sceKernelDcacheWritebackAll();
for (;;)
{
draw_menu_tray(menu_sel);
- inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_X, 0);
+ inp = wait_for_input(BTN_UP|BTN_DOWN|BTN_CIRCLE, 0);
if(inp & BTN_UP ) { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; }
if(inp & BTN_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }
if(inp & BTN_CIRCLE) {
notaz.gp2x.de / libpicofe.git / blobdiff