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

fix audioapi opt enum, reorder xrc 

The config option name enum needs to match the actual enum, since the
value is an integer. Unavailable APIs are not shown using #ifdefs in
guiinit.cpp.

Also reorder the radio button xrcs to be in the order of the enum.
This commit is contained in:
Rafael Kitover 2019-01-01 18:44:51 -08:00
parent 8cb3f5a78c
commit 964f086bea
3 changed files with 22 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/wx/faudio.cpp
View File

@ -25,6 +25,9 @@ int GetFADevices(FAudio* fa, wxArrayString* names, wxArrayString* ids,
{ {
HRESULT hr; HRESULT hr;
UINT32 dev_count = 0; UINT32 dev_count = 0;
wxLogDebug("IN FAUDIO INIT");
hr = FAudio_GetDeviceCount(fa, &dev_count); hr = FAudio_GetDeviceCount(fa, &dev_count);
if (hr != S_OK) { if (hr != S_OK) {

24
src/wx/opts.cpp
View File

@ -255,29 +255,7 @@ opt_desc opts[] = {
/// Sound /// Sound
#define OAL_SOUND "openal|" ENUMOPT("Sound/AudioAPI", "", wxTRANSLATE("Sound API; if unsupported, default API will be used"), gopts.audio_api, wxTRANSLATE("sdl|openal|directsound|xaudio2|faudio")),
#ifdef NO_OAL
# define OAL_SOUND ""
#endif
#define XAUDIO2_SOUND "xaudio2|"
#ifdef NO_XAUDIO2
# define XAUDIO2_SOUND ""
#endif
#define FAUDIO_SOUND "faudio|"
#ifdef NO_FAUDIO
# define FAUDIO_SOUND ""
#endif
#ifdef __WXMSW__
ENUMOPT("Sound/AudioAPI", "", wxTRANSLATE("Sound API; if unsupported, default API will be used"), gopts.audio_api, wxTRANSLATE("sdl|" OAL_SOUND "directsound|" FAUDIO_SOUND "xaudio2")),
#else
ENUMOPT("Sound/AudioAPI", "", wxTRANSLATE("Sound API; if unsupported, default API will be used"), gopts.audio_api, wxTRANSLATE("sdl|" OAL_SOUND FAUDIO_SOUND)),
#endif
INTOPT("Sound/Buffers", "", wxTRANSLATE("Number of sound buffers"), gopts.audio_buffers, 2, 10), INTOPT("Sound/Buffers", "", wxTRANSLATE("Number of sound buffers"), gopts.audio_buffers, 2, 10),
INTOPT("Sound/Enable", "", wxTRANSLATE("Bit mask of sound channels to enable"), gopts.sound_en, 0, 0x30f), INTOPT("Sound/Enable", "", wxTRANSLATE("Bit mask of sound channels to enable"), gopts.sound_en, 0, 0x30f),
INTOPT("Sound/GBAFiltering", "", wxTRANSLATE("GBA sound filtering (%)"), gopts.gba_sound_filter, 0, 100), INTOPT("Sound/GBAFiltering", "", wxTRANSLATE("GBA sound filtering (%)"), gopts.gba_sound_filter, 0, 100),

32
src/wx/xrc/SoundConfig.xrc
View File

@ -109,20 +109,7 @@
<object class="sizeritem"> <object class="sizeritem">
<object class="wxRadioButton" name="OpenAL"> <object class="wxRadioButton" name="OpenAL">
<label>OpenAL</label> <label>OpenAL</label>
</object> <style>wxRB_GROUP</style>
<flag>wxALL|wxEXPAND</flag>
<border>5</border>
</object>
<object class="sizeritem">
<object class="wxRadioButton" name="XAudio2">
<label>XAudio2</label>
</object>
<flag>wxALL|wxEXPAND</flag>
<border>5</border>
</object>
<object class="sizeritem">
<object class="wxRadioButton" name="FAudio">
<label>FAudio</label>
</object> </object>
<flag>wxALL|wxEXPAND</flag> <flag>wxALL|wxEXPAND</flag>
<border>5</border> <border>5</border>
@ -130,10 +117,27 @@
<object class="sizeritem"> <object class="sizeritem">
<object class="wxRadioButton" name="DirectSound"> <object class="wxRadioButton" name="DirectSound">
<label>DirectSound</label> <label>DirectSound</label>
<style>wxRB_GROUP</style>
</object> </object>
<flag>wxALL</flag> <flag>wxALL</flag>
<border>5</border> <border>5</border>
</object> </object>
<object class="sizeritem">
<object class="wxRadioButton" name="XAudio2">
<label>XAudio2</label>
<style>wxRB_GROUP</style>
</object>
<flag>wxALL|wxEXPAND</flag>
<border>5</border>
</object>
<object class="sizeritem">
<object class="wxRadioButton" name="FAudio">
<label>FAudio</label>
<style>wxRB_GROUP</style>
</object>
<flag>wxALL|wxEXPAND</flag>
<border>5</border>
</object>
<orient>wxHORIZONTAL</orient> <orient>wxHORIZONTAL</orient>
</object> </object>
<flag>wxEXPAND</flag> <flag>wxEXPAND</flag>