X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fpsp%2Fmenu.c;h=996f68797591d5464012e4b04b0a4e40fe847316;hb=8b99ab90aa519639a87c302c9a26fef526febde9;hp=ccb472bd40639b5b7f669174dac7a62d8992b185;hpb=9caf44b59bf20d0beb614d4249cf908c7fb7434d;p=picodrive.git

diff --git a/platform/psp/menu.c b/platform/psp/menu.c
index ccb472b..996f687 100644
--- a/platform/psp/menu.c
+++ b/platform/psp/menu.c
@@ -1,4 +1,4 @@
-// (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.
@@ -20,6 +20,7 @@
 #include "psp.h"
 #include "emu.h"
 #include "menu.h"
+#include "mp3.h"
 #include "../common/menu.h"
 #include "../common/emu.h"
 #include "../common/readpng.h"
@@ -112,17 +113,37 @@ static void menu_draw_end(void)
 
 // --------- 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);
 }
 
@@ -132,17 +153,20 @@ void menu_romload_prepare(const char *rom_name)
 	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 --------------
@@ -429,8 +453,10 @@ static void draw_debug(void)
 
 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 ------------
@@ -893,24 +919,29 @@ static void cd_menu_loop_options(void)
 	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);
@@ -927,11 +958,12 @@ static void cd_menu_loop_options(void)
 				}
 			}
 		}
-		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
@@ -1030,7 +1062,7 @@ static void menu_opt3_preview(int is_32col)
 			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);
 
@@ -1090,6 +1122,7 @@ static void dispmenu_loop_options(void)
 			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
 				}
@@ -1557,6 +1590,14 @@ static void menu_loop_root(void)
 	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);
 
@@ -1577,6 +1618,7 @@ static void menu_loop_root(void)
 			}
 		}
 		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:
@@ -1660,7 +1702,6 @@ static void menu_loop_root(void)
 					break;
 			}
 		}
-		menuErrorMsg[0] = 0; // clear error msg
 	}
 }
 
@@ -1698,12 +1739,12 @@ static void menu_prepare_bg(int use_game_bg, int use_fg)
 		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();
@@ -1777,7 +1818,7 @@ int menu_loop_tray(void)
 	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)  {