diff --git a/Makefile.gc b/Makefile.gc index c47acd6..a5d03db 100644 --- a/Makefile.gc +++ b/Makefile.gc @@ -27,8 +27,7 @@ INCLUDES := include src/platform/wii #--------------------------------------------------------------------------------- CFLAGS = -g -O3 -Wall $(MACHDEP) $(INCLUDE) \ - -fomit-frame-pointer \ - -Wno-unused-parameter -Wno-strict-aliasing \ + -fomit-frame-pointer -Wno-strict-aliasing \ -DWORDS_BIGENDIAN CXXFLAGS = $(CFLAGS) LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map diff --git a/Makefile.wii b/Makefile.wii index 2861453..fd4df1b 100644 --- a/Makefile.wii +++ b/Makefile.wii @@ -27,8 +27,7 @@ INCLUDES := include src/platform/wii #--------------------------------------------------------------------------------- CFLAGS = -g -O3 -Wall $(MACHDEP) $(INCLUDE) \ - -fomit-frame-pointer \ - -Wno-unused-parameter -Wno-strict-aliasing \ + -fomit-frame-pointer -Wno-strict-aliasing \ -DWORDS_BIGENDIAN CXXFLAGS = $(CFLAGS) LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map -Wl,--cref diff --git a/src/dosbox.cpp b/src/dosbox.cpp index 7ccba65..c8fb8fc 100644 --- a/src/dosbox.cpp +++ b/src/dosbox.cpp @@ -439,7 +439,7 @@ void DOSBOX_Init(void) { Pbool->Set_help("Enable silent mode, sound is still emulated though."); #ifdef HW_RVL - Pint = secprop->Add_int("rate",Property::Changeable::OnlyAtStart,48000); + Pint = secprop->Add_int("rate",Property::Changeable::OnlyAtStart,32000); #else Pint = secprop->Add_int("rate",Property::Changeable::OnlyAtStart,22050); #endif @@ -448,7 +448,11 @@ void DOSBOX_Init(void) { const char *blocksizes[] = { "2048", "4096", "8192", "1024", "512", "256", 0}; +#ifdef HW_RVL + Pint = secprop->Add_int("blocksize",Property::Changeable::OnlyAtStart,512); +#else Pint = secprop->Add_int("blocksize",Property::Changeable::OnlyAtStart,2048); +#endif Pint->Set_values(blocksizes); Pint->Set_help("Mixer block size, larger blocks might help sound stuttering but sound will also be more lagged."); @@ -514,7 +518,7 @@ void DOSBOX_Init(void) { Pstring->Set_help("Provider for the OPL emulation. compat or old might provide better quality (see oplrate as well)."); #ifdef HW_RVL - Pint = secprop->Add_int("oplrate",Property::Changeable::WhenIdle,48000); + Pint = secprop->Add_int("oplrate",Property::Changeable::WhenIdle,32000); #else Pint = secprop->Add_int("oplrate",Property::Changeable::WhenIdle,22050); #endif @@ -527,7 +531,7 @@ void DOSBOX_Init(void) { Pbool->Set_help("Enable the Gravis Ultrasound emulation."); #ifdef HW_RVL - Pint = secprop->Add_int("gusrate",Property::Changeable::WhenIdle,48000); + Pint = secprop->Add_int("gusrate",Property::Changeable::WhenIdle,32000); #else Pint = secprop->Add_int("gusrate",Property::Changeable::WhenIdle,22050); #endif @@ -558,7 +562,7 @@ void DOSBOX_Init(void) { Pbool->Set_help("Enable PC-Speaker emulation."); #ifdef HW_RVL - Pint = secprop->Add_int("pcrate",Property::Changeable::WhenIdle,48000); + Pint = secprop->Add_int("pcrate",Property::Changeable::WhenIdle,32000); #else Pint = secprop->Add_int("pcrate",Property::Changeable::WhenIdle,22050); #endif @@ -572,7 +576,7 @@ void DOSBOX_Init(void) { Pstring->Set_help("Enable Tandy Sound System emulation. For 'auto', emulation is present only if machine is set to 'tandy'."); #ifdef HW_RVL - Pint = secprop->Add_int("tandyrate",Property::Changeable::WhenIdle,48000); + Pint = secprop->Add_int("tandyrate",Property::Changeable::WhenIdle,32000); #else Pint = secprop->Add_int("tandyrate",Property::Changeable::WhenIdle,22050); #endif diff --git a/src/gui/sdlmain.cpp b/src/gui/sdlmain.cpp index 22317f7..14dcf90 100644 --- a/src/gui/sdlmain.cpp +++ b/src/gui/sdlmain.cpp @@ -1225,7 +1225,7 @@ void GFX_LosingFocus(void) { } void GFX_Events() { -#ifdef HWRVL +#ifdef HW_RVL // check for home button u32 btns; for(int i=0; i<4; i++) diff --git a/src/hardware/mixer.cpp b/src/hardware/mixer.cpp index 9693a30..5a4d660 100644 --- a/src/hardware/mixer.cpp +++ b/src/hardware/mixer.cpp @@ -639,7 +639,7 @@ void MIXER_Init(Section* sec) { SDL_AudioSpec obtained; spec.freq=mixer.freq; - spec.format=AUDIO_S16SYS; + spec.format=AUDIO_S16MSB; spec.channels=2; spec.callback=MIXER_CallBack; spec.userdata=NULL;