add home button to exit, change defaults, remove press A requirement for startup/shutdown.

This commit is contained in:
dborth 2009-05-07 04:58:47 +00:00
parent bd8e629a05
commit 232d8849a5
4 changed files with 57 additions and 54 deletions

View File

@ -438,7 +438,7 @@ void DOSBOX_Init(void) {
Pbool = secprop->Add_bool("nosound",Property::Changeable::OnlyAtStart,false);
Pbool->Set_help("Enable silent mode, sound is still emulated though.");
Pint = secprop->Add_int("rate",Property::Changeable::OnlyAtStart,22050);
Pint = secprop->Add_int("rate",Property::Changeable::OnlyAtStart,48000);
Pint->Set_values(rates);
Pint->Set_help("Mixer sample rate, setting any device's rate higher than this will probably lower their sound quality.");
@ -509,7 +509,7 @@ void DOSBOX_Init(void) {
Pstring->Set_values(oplemus);
Pstring->Set_help("Provider for the OPL emulation. compat or old might provide better quality (see oplrate as well).");
Pint = secprop->Add_int("oplrate",Property::Changeable::WhenIdle,22050);
Pint = secprop->Add_int("oplrate",Property::Changeable::WhenIdle,48000);
Pint->Set_values(oplrates);
Pint->Set_help("Sample rate of OPL music emulation. Use 49716 for highest quality (set the mixer rate accordingly).");
@ -518,7 +518,7 @@ void DOSBOX_Init(void) {
Pbool = secprop->Add_bool("gus",Property::Changeable::WhenIdle,false);
Pbool->Set_help("Enable the Gravis Ultrasound emulation.");
Pint = secprop->Add_int("gusrate",Property::Changeable::WhenIdle,22050);
Pint = secprop->Add_int("gusrate",Property::Changeable::WhenIdle,48000);
Pint->Set_values(rates);
Pint->Set_help("Sample rate of Ultrasound emulation.");
@ -545,7 +545,7 @@ void DOSBOX_Init(void) {
Pbool = secprop->Add_bool("pcspeaker",Property::Changeable::WhenIdle,true);
Pbool->Set_help("Enable PC-Speaker emulation.");
Pint = secprop->Add_int("pcrate",Property::Changeable::WhenIdle,22050);
Pint = secprop->Add_int("pcrate",Property::Changeable::WhenIdle,48000);
Pint->Set_values(rates);
Pint->Set_help("Sample rate of the PC-Speaker sound generation.");
@ -555,7 +555,7 @@ void DOSBOX_Init(void) {
Pstring->Set_values(tandys);
Pstring->Set_help("Enable Tandy Sound System emulation. For 'auto', emulation is present only if machine is set to 'tandy'.");
Pint = secprop->Add_int("tandyrate",Property::Changeable::WhenIdle,22050);
Pint = secprop->Add_int("tandyrate",Property::Changeable::WhenIdle,48000);
Pint->Set_values(rates);
Pint->Set_help("Sample rate of the Tandy 3-Voice generation.");

View File

@ -1225,6 +1225,15 @@ void GFX_LosingFocus(void) {
}
void GFX_Events() {
// check for home button
u32 btns;
for(int i=0; i<4; i++)
{
btns = WPAD_ButtonsHeld(i);
if((btns & WPAD_BUTTON_HOME) || (btns & WPAD_CLASSIC_BUTTON_HOME))
throw(0);
}
SDL_Event event;
#if defined (REDUCE_JOYSTICK_POLLING)
static int poll_delay=0;
@ -1380,10 +1389,10 @@ void Config_Add_SDL() {
Prop_int* Pint;
Prop_multival* Pmulti;
Pbool = sdl_sec->Add_bool("fullscreen",Property::Changeable::Always,false);
Pbool = sdl_sec->Add_bool("fullscreen",Property::Changeable::Always,true);
Pbool->Set_help("Start dosbox directly in fullscreen.");
Pbool = sdl_sec->Add_bool("fulldouble",Property::Changeable::Always,false);
Pbool = sdl_sec->Add_bool("fulldouble",Property::Changeable::Always,true);
Pbool->Set_help("Use double buffering in fullscreen.");
Pstring = sdl_sec->Add_string("fullresolution",Property::Changeable::Always,"original");

View File

@ -29,7 +29,5 @@ bool WiiMessagePause(const char *s) {
}
void WiiFinished() {
#ifdef HW_RVL
if (WiiMessagePause("Press A to return to homebrew channel.\n")) exit(0);
#endif
}

View File

@ -668,10 +668,6 @@ void SHELL_Init() {
SHELL_ProgramStart(&first_shell);
#ifdef HW_RVL
WiiMessagePause("Press A to continue (or Home to exit).\n");
#endif
first_shell->Run();
delete first_shell;
first_shell = 0;//Make clear that it shouldn't be used anymore