psp mp3 implementation

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@293 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2007-11-10 22:43:26 +00:00
parent b5e5172d04
commit 4b167c12c7
14 changed files with 557 additions and 40 deletions

View file

@ -285,7 +285,7 @@ int emu_ReloadRom(void)
return 0;
}
menu_romload_prepare(used_rom_name);
menu_romload_prepare(used_rom_name); // also CD load
if(rom_data) {
free(rom_data);
@ -301,7 +301,6 @@ int emu_ReloadRom(void)
return 0;
}
pm_close(rom);
menu_romload_end();
// detect wrong files (Pico crashes on very small files), also see if ROM EP is good
if(rom_size <= 0x200 || strncmp((char *)rom_data, "Pico", 4) == 0 ||
@ -309,6 +308,7 @@ int emu_ReloadRom(void)
if (rom_data) free(rom_data);
rom_data = 0;
sprintf(menuErrorMsg, "Not a ROM selected.");
menu_romload_end();
return 0;
}
@ -321,6 +321,7 @@ int emu_ReloadRom(void)
lprintf("PicoCartInsert(%p, %d);\n", rom_data, rom_size);
if(PicoCartInsert(rom_data, rom_size)) {
sprintf(menuErrorMsg, "Failed to load ROM.");
menu_romload_end();
return 0;
}
@ -332,10 +333,13 @@ int emu_ReloadRom(void)
if (ret != 0) {
sprintf(menuErrorMsg, "Insert_CD() failed, invalid CD image?");
lprintf("%s\n", menuErrorMsg);
menu_romload_end();
return 0;
}
}
menu_romload_end();
// emu_ReadConfig() might have messed currentConfig.lastRomFile
strncpy(currentConfig.lastRomFile, romFileName, sizeof(currentConfig.lastRomFile)-1);
currentConfig.lastRomFile[sizeof(currentConfig.lastRomFile)-1] = 0;