ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #249 from retro-wertz/updates 

GB: Fix sound options not working
This commit is contained in:
Zach Bacon 2018-06-09 10:08:14 -04:00 committed by GitHub
parent abb62df6f3 991fc74922
commit 03bc7c247e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/wx/cmdevents.cpp
View File

@ -2315,17 +2315,18 @@ EVT_HANDLER_MASK(SoundConfigure, "Sound options...", CMDEN_NREC_ANY)
return; return;
switch (panel->game_type()) { switch (panel->game_type()) {
case IMAGE_UNKNOWN:
break;
case IMAGE_GB: case IMAGE_GB:
gb_effects_config.echo = (float)gopts.gb_echo / 100.0; gb_effects_config.echo = (float)gopts.gb_echo / 100.0;
gb_effects_config.stereo = (float)gopts.gb_stereo / 100.0; gb_effects_config.stereo = (float)gopts.gb_stereo / 100.0;
// note that setting declick may reset gb sound engine
gbSoundSetDeclicking(gopts.gb_declick);
gbSoundSetSampleRate(!gopts.sound_qual ? 48000 : 44100 / (1 << (gopts.sound_qual - 1))); gbSoundSetSampleRate(!gopts.sound_qual ? 48000 : 44100 / (1 << (gopts.sound_qual - 1)));
break; break;
case IMAGE_GBA: case IMAGE_GBA:
case IMAGE_UNKNOWN:
soundSetSampleRate(!gopts.sound_qual ? 48000 : 44100 / (1 << (gopts.sound_qual - 1))); soundSetSampleRate(!gopts.sound_qual ? 48000 : 44100 / (1 << (gopts.sound_qual - 1)));
soundFiltering = (float)gopts.gba_sound_filter / 100.0f;
break; break;
} }
@ -2341,9 +2342,6 @@ EVT_HANDLER_MASK(SoundConfigure, "Sound options...", CMDEN_NREC_ANY)
soundSetVolume((float)gopts.sound_vol / 100.0); soundSetVolume((float)gopts.sound_vol / 100.0);
update_opts(); update_opts();
if (emulating)
soundReset();
} }
EVT_HANDLER(EmulatorDirectories, "Directories...") EVT_HANDLER(EmulatorDirectories, "Directories...")
@ -2504,18 +2502,22 @@ EVT_HANDLER(GBASoundInterpolation, "GBA sound interpolation")
EVT_HANDLER(GBDeclicking, "GB sound declicking") EVT_HANDLER(GBDeclicking, "GB sound declicking")
{ {
GetMenuOptionBool("GBDeclicking", gopts.gb_declick); GetMenuOptionBool("GBDeclicking", gopts.gb_declick);
// note that setting declick may reset gb sound engine
gbSoundSetDeclicking(gopts.gb_declick);
update_opts(); update_opts();
} }
EVT_HANDLER(GBEnhanceSound, "Enable GB sound effects") EVT_HANDLER(GBEnhanceSound, "Enable GB sound effects")
{ {
GetMenuOptionBool("GBEnhanceSound", gopts.gb_effects_config_enabled); GetMenuOptionBool("GBEnhanceSound", gopts.gb_effects_config_enabled);
gb_effects_config.enabled = gopts.gb_effects_config_enabled;
update_opts(); update_opts();
} }
EVT_HANDLER(GBSurround, "GB surround sound effect (%)") EVT_HANDLER(GBSurround, "GB surround sound effect (%)")
{ {
GetMenuOptionBool("GBSurround", gopts.gb_effects_config_surround); GetMenuOptionBool("GBSurround", gopts.gb_effects_config_surround);
gb_effects_config.surround = gopts.gb_effects_config_surround;
update_opts(); update_opts();
} }

2
src/wx/panel.cpp
View File

@ -161,6 +161,8 @@ void GameArea::LoadGame(const wxString& name)
} }
// start sound; this must happen before CPU stuff // start sound; this must happen before CPU stuff
gb_effects_config.enabled = gopts.gb_effects_config_enabled;
gb_effects_config.surround = gopts.gb_effects_config_surround;
gb_effects_config.echo = (float)gopts.gb_echo / 100.0; gb_effects_config.echo = (float)gopts.gb_echo / 100.0;
gb_effects_config.stereo = (float)gopts.gb_stereo / 100.0; gb_effects_config.stereo = (float)gopts.gb_stereo / 100.0;
gbSoundSetDeclicking(gopts.gb_declick); gbSoundSetDeclicking(gopts.gb_declick);