The-Homebrew-Cloud/dosbox-wii
2
0
Fork 0
mirror of https://github.com/retro100/dosbox-wii.git synced 2024-06-28 07:06:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix HW_RVL typo, switch to 32000 big endian sound with 512 sample size. music works fine now with latest SDL svn, but dosbox mixer is doing strange things with the volume level.

Browse Source
This commit is contained in:
dborth 2009-05-11 08:36:17 +00:00
parent a142aa3d65
commit bdcf3eda79
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.gc
View File

@ -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

3
Makefile.wii
View File

@ -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

14
src/dosbox.cpp
View File

@ -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

2
src/gui/sdlmain.cpp
View File

@ -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++)

2
src/hardware/mixer.cpp
View File

@ -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;