X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=fceu.git;a=blobdiff_plain;f=drivers%2Fgp2x%2Fmain.c;h=ad36e016a635c1ca4b42f2020ed1045e93d49d27;hp=fc9c7b6929f022fee56e8d2eb6bf4c90b366dd6f;hb=937bf65b1c80e9394547e5f105664bd26f3671de;hpb=9115e7d2b5e5b8dc00774fe92db97f1d02b2fee1 diff --git a/drivers/gp2x/main.c b/drivers/gp2x/main.c index fc9c7b6..ad36e01 100644 --- a/drivers/gp2x/main.c +++ b/drivers/gp2x/main.c @@ -304,17 +304,23 @@ int CLImain(int argc, char *argv[]) FCEUGI *tmp; int ret; + if(argc<=1) + { + ShowUsage(argv[0]); + return 1; + } + + if(!DriverInitialize()) + { + return 1; + } + if(!(ret=FCEUI_Initialize())) return(1); GetBaseDirectory(BaseDirectory); FCEUI_SetBaseDirectory(BaseDirectory); CreateDirs(); - if(argc<=1) - { - ShowUsage(argv[0]); - return 1; - } LoadConfig(); DoArgs(argc-2,&argv[1]); if(cpalette) @@ -329,11 +335,6 @@ int CLImain(int argc, char *argv[]) } ParseGI(tmp); //RefreshThrottleFPS(); - if(!DriverInitialize()) - { - ret=0; - goto dk; - } InitOtherInput(); FCEUI_Emulate(); @@ -373,13 +374,13 @@ static void DriverKill(void) inited=0; } -void FCEUD_Update(uint8 *XBuf, int16 *Buffer, int Count) +void FCEUD_Update(uint8 *xbuf, int16 *Buffer, int Count) { if(!Count && !NoWaiting && !(eoptions&EO_NOTHROTTLE)) SpeedThrottle(); - BlitScreen(XBuf); - if(Count) - WriteSound(Buffer,Count,NoWaiting); + BlitScreen(xbuf); + if(Count && !NoWaiting && !(eoptions&EO_NOTHROTTLE)) + WriteSound(Buffer,Count); FCEUD_UpdateInput(); }