mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 06:09:50 -06:00
remove some junk added in last few commits. Also I really don't like the style recently...and removing PCH? wtf???
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2777 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -18,9 +18,7 @@
|
||||
#include "AudioCommon.h"
|
||||
#include "Mixer.h"
|
||||
#include "AOSoundStream.h"
|
||||
#ifdef _WIN32
|
||||
#include "DSoundStream.h"
|
||||
#endif
|
||||
#include "NullSoundStream.h"
|
||||
#include "OpenALStream.h"
|
||||
|
||||
@ -33,10 +31,8 @@ SoundStream *InitSoundStream(std::string backend, CMixer *mixer) {
|
||||
}
|
||||
|
||||
if (backend == "DSound") {
|
||||
#ifdef _DSOUNDSTREAM_H_
|
||||
if (DSound::isValid())
|
||||
soundStream = new DSound(mixer, g_dspInitialize.hWnd);
|
||||
#endif
|
||||
}
|
||||
else if (backend == "AOSound") {
|
||||
if (AOSound::isValid())
|
||||
@ -94,10 +90,8 @@ void ShutdownSoundStream() {
|
||||
std::vector<std::string> GetSoundBackends() {
|
||||
std::vector<std::string> backends;
|
||||
// Add avaliable output options
|
||||
#ifdef _DSOUNDSTREAM_H_
|
||||
if (DSound::isValid())
|
||||
backends.push_back("DSound");
|
||||
#endif
|
||||
if (AOSound::isValid())
|
||||
backends.push_back("AOSound");
|
||||
if (OpenALStream::isValid())
|
||||
|
Reference in New Issue
Block a user