disable readahead for SD, remove sound options, delay loop for exiting menu

This commit is contained in:
dborth 2008-10-04 01:02:05 +00:00
parent ee0e5bf02e
commit 5c7fbaec11
2 changed files with 16 additions and 28 deletions

View File

@ -63,7 +63,7 @@ bool ChangeFATInterface(int method, bool silent)
{ {
devFound = true; devFound = true;
fatSetDefaultInterface(PI_INTERNAL_SD); fatSetDefaultInterface(PI_INTERNAL_SD);
fatEnableReadAhead (PI_INTERNAL_SD, 6, 64); //fatEnableReadAhead (PI_INTERNAL_SD, 6, 64);
} }
#endif #endif

View File

@ -540,7 +540,7 @@ FileOptions ()
/**************************************************************************** /****************************************************************************
* Video Options * Video Options
***************************************************************************/ ***************************************************************************/
static int videomenuCount = 14; static int videomenuCount = 12;
static char videomenu[][50] = { static char videomenu[][50] = {
"Transparency", "Transparency",
@ -557,8 +557,6 @@ static char videomenu[][50] = {
"Shift: ", "Shift: ",
"Reset Video Shift", "Reset Video Shift",
"Reverse Stereo",
"Interpolated Sound",
"Back to Preferences Menu" "Back to Preferences Menu"
}; };
@ -596,12 +594,6 @@ VideoOptions ()
sprintf (videomenu[9], "Video Shift: %d, %d", GCSettings.xshift, GCSettings.yshift); sprintf (videomenu[9], "Video Shift: %d, %d", GCSettings.xshift, GCSettings.yshift);
sprintf (videomenu[11], "Reverse Stereo %s",
Settings.ReverseStereo == true ? " ON" : "OFF");
sprintf (videomenu[12], "Interpolated Sound %s",
Settings.InterpolatedSound == true ? " ON" : "OFF");
ret = RunMenu (videomenu, videomenuCount, (char*)"Video Options", 16); ret = RunMenu (videomenu, videomenuCount, (char*)"Video Options", 16);
switch (ret) switch (ret)
@ -656,16 +648,8 @@ VideoOptions ()
WaitPrompt((char *)"Video Shift Reset"); WaitPrompt((char *)"Video Shift Reset");
break; break;
case 11:
Settings.ReverseStereo ^= 1;
break;
case 12:
Settings.InterpolatedSound ^= 1;
break;
case -1: // Button B case -1: // Button B
case 13: case 11:
quit = 1; quit = 1;
break; break;
@ -1001,7 +985,7 @@ ConfigureControllers ()
static int prefmenuCount = 5; static int prefmenuCount = 5;
static char prefmenu[][50] = { static char prefmenu[][50] = {
"Controllers", "Controllers",
"Video / Sound", "Video",
"Saving / Loading", "Saving / Loading",
"Reset Preferences", "Reset Preferences",
"Back to Main Menu" "Back to Main Menu"
@ -1148,12 +1132,16 @@ MainMenu (int selectedMenu)
} }
} }
/*** Remove any still held buttons ***/ // Wait for buttons to be released
#ifdef HW_RVL int count = 0; // how long we've been waiting for the user to release the button
while( PAD_ButtonsHeld(0) || WPAD_ButtonsHeld(0) ) while(count < 50 && (
VIDEO_WaitVSync(); PAD_ButtonsHeld(0)
#else #ifdef HW_RVL
while( PAD_ButtonsHeld(0) ) || WPAD_ButtonsHeld(0)
VIDEO_WaitVSync(); #endif
#endif ))
{
VIDEO_WaitVSync();
count++;
}
} }