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

Finish hooking up FAudio to the rest of the frontend

This commit is contained in:
ZachBacon 2018-12-25 20:58:31 -05:00
parent 539027ca16
commit d6f3fd23de
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wx/cmdevents.cpp
View File

@ -2336,7 +2336,7 @@ EVT_HANDLER_MASK(SoundConfigure, "Sound options...", CMDEN_NREC_ANY)
// otherwise reload if API changes // otherwise reload if API changes
(oapi != gopts.audio_api || odev != gopts.audio_dev || (oapi != gopts.audio_api || odev != gopts.audio_dev ||
// or init-only options // or init-only options
(oapi == AUD_XAUDIO2 && oupmix != gopts.upmix) || (oapi == AUD_DIRECTSOUND && ohw != gopts.dsound_hw_accel))) { (oapi == AUD_XAUDIO2 && oupmix != gopts.upmix) || (oapi == AUD_FAUDIO && oupmix != gopts.upmix) || (oapi == AUD_DIRECTSOUND && ohw != gopts.dsound_hw_accel))) {
soundShutdown(); soundShutdown();
soundInit(); soundInit();
} }

4
src/wx/sys.cpp
View File

@ -1096,6 +1096,10 @@ SoundDriver* systemSoundInit()
case AUD_XAUDIO2: case AUD_XAUDIO2:
return newXAudio2_Output(); return newXAudio2_Output();
#endif #endif
#ifndef NO_FAUDIO
case AUD_FAUDIO:
return newFAudio_Output();
#endif
#endif #endif
default: default:

3
src/wx/wxvbam.h
View File

@ -449,6 +449,7 @@ enum renderer {
enum audioapi { AUD_SDL, enum audioapi { AUD_SDL,
AUD_OPENAL, AUD_OPENAL,
AUD_DIRECTSOUND, AUD_DIRECTSOUND,
AUD_FAUDIO,
AUD_XAUDIO2 }; AUD_XAUDIO2 };
// an unfortunate legacy default; should have a non-digit preceding %d // an unfortunate legacy default; should have a non-digit preceding %d
@ -712,6 +713,8 @@ extern SoundDriver* newDirectSound();
extern bool GetDSDevices(wxArrayString& names, wxArrayString& ids); extern bool GetDSDevices(wxArrayString& names, wxArrayString& ids);
extern SoundDriver* newXAudio2_Output(); extern SoundDriver* newXAudio2_Output();
extern bool GetXA2Devices(wxArrayString& names, wxArrayString& ids); extern bool GetXA2Devices(wxArrayString& names, wxArrayString& ids);
extern SoundDriver* newFAudio_Output();
extern bool GetFSDevices(wxArrayString& names, wxArrayString& ids);
#endif #endif
extern bool debugger; extern bool debugger;