RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 07:17:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

major menu unification, minor reorganization

Browse source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive@639 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2009-03-02 23:13:15 +00:00
parent 1fb0dd88aa
commit 713c922402
25 changed files with 1640 additions and 507 deletions
Download patch file Download diff file Expand all files Collapse all files

9
platform/psp/emu.c
View file

@ -33,9 +33,8 @@ int sceAudio_E0727056(int volume, void *buffer); // blocking output
int sceAudioOutput2GetRestSample();
char romFileName[PATH_MAX];
unsigned char *PicoDraw2FB = (unsigned char *)VRAM_CACHED_STUFF + 8; // +8 to be able to skip border with 1 quadword..
int engineState = PGS_Menu, engineStateSuspend;
int engineStateSuspend;
static unsigned int noticeMsgTime = 0;
int reset_timing = 0; // do we need this?
@ -1127,13 +1126,13 @@ void emu_HandleResume(void)
// reopen first CD track
if (Pico_mcd->TOC.Tracks[0].F != NULL)
{
char *fname = romFileName;
int len = strlen(romFileName);
char *fname = rom_fname_reload;
int len = strlen(rom_fname_reload);
cue_data_t *cue_data = NULL;
if (len > 4 && strcasecmp(fname + len - 4, ".cue") == 0)
{
cue_data = cue_parse(romFileName);
cue_data = cue_parse(rom_fname_reload);
if (cue_data != NULL)
fname = cue_data->tracks[1].fname;
}

5
platform/psp/emu.h
View file

@ -4,10 +4,7 @@
// For commercial use, separate licencing terms must be obtained.
extern char romFileName[];
extern int engineState, engineStateSuspend;
extern int engineStateSuspend;
void emu_Init(void);
void emu_Deinit(void);

6
platform/psp/main.c
View file

@ -23,7 +23,7 @@
void dummy(void)
{
engineState = atoi(romFileName);
engineState = atoi(rom_fname_reload);
setbuf(NULL, NULL);
getenv(NULL);
}
@ -52,13 +52,13 @@ int pico_main(void)
#ifndef GPROF
menu_loop();
#else
strcpy(romFileName, loadedRomFName);
strcpy(rom_fname_reload, rom_fname_loaded);
engineState = PGS_ReloadRom;
#endif
break;
case PGS_ReloadRom:
if (emu_ReloadRom(romFileName)) {
if (emu_ReloadRom(rom_fname_reload)) {
engineState = PGS_Running;
if (mp3_last_error != 0)
engineState = PGS_Menu; // send to menu to display mp3 error