piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

remove some junk added in last few commits. Also I really don't like the style recently...and removing PCH? wtf???

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2777 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman
2009-03-28 16:23:06 +00:00
parent 632e3bfc85
commit 3a5fb88b5e
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/AudioCommon/Src/AudioCommon.cpp
View File

@ -18,9 +18,7 @@
#include "AudioCommon.h" #include "AudioCommon.h"
#include "Mixer.h" #include "Mixer.h"
#include "AOSoundStream.h" #include "AOSoundStream.h"
#ifdef _WIN32
#include "DSoundStream.h" #include "DSoundStream.h"
#endif
#include "NullSoundStream.h" #include "NullSoundStream.h"
#include "OpenALStream.h" #include "OpenALStream.h"
@ -33,10 +31,8 @@ SoundStream *InitSoundStream(std::string backend, CMixer *mixer) {
} }
if (backend == "DSound") { if (backend == "DSound") {
#ifdef _DSOUNDSTREAM_H_
if (DSound::isValid()) if (DSound::isValid())
soundStream = new DSound(mixer, g_dspInitialize.hWnd); soundStream = new DSound(mixer, g_dspInitialize.hWnd);
#endif
} }
else if (backend == "AOSound") { else if (backend == "AOSound") {
if (AOSound::isValid()) if (AOSound::isValid())
@ -94,10 +90,8 @@ void ShutdownSoundStream() {
std::vector<std::string> GetSoundBackends() { std::vector<std::string> GetSoundBackends() {
std::vector<std::string> backends; std::vector<std::string> backends;
// Add avaliable output options // Add avaliable output options
#ifdef _DSOUNDSTREAM_H_
if (DSound::isValid()) if (DSound::isValid())
backends.push_back("DSound"); backends.push_back("DSound");
#endif
if (AOSound::isValid()) if (AOSound::isValid())
backends.push_back("AOSound"); backends.push_back("AOSound");
if (OpenALStream::isValid()) if (OpenALStream::isValid())

17
Source/Core/AudioCommon/Src/DSoundStream.h
View File

@ -31,6 +31,7 @@
class DSound : public SoundStream class DSound : public SoundStream
{ {
#ifdef _WIN32
Common::Thread *thread; Common::Thread *thread;
Common::CriticalSection soundCriticalSection; Common::CriticalSection soundCriticalSection;
Common::Event soundSyncEvent; Common::Event soundSyncEvent;
@ -60,10 +61,13 @@ class DSound : public SoundStream
DWORD dwSoundBytes); DWORD dwSoundBytes);
public: public:
DSound(CMixer *mixer, void *hWnd = NULL) : SoundStream(mixer), DSound(CMixer *mixer, void *hWnd = NULL)
bufferSize(0), : SoundStream(mixer)
totalRenderedBytes(0), , bufferSize(0)
currentPos(0),lastPos(0) {} , totalRenderedBytes(0)
, currentPos(0)
, lastPos(0)
{}
virtual ~DSound() {} virtual ~DSound() {}
@ -73,6 +77,11 @@ public:
static bool isValid() { return true; } static bool isValid() { return true; }
virtual bool usesMixer() const { return true; } virtual bool usesMixer() const { return true; }
virtual void Update(); virtual void Update();
#else
DSound(CMixer *mixer)
: SoundStream(mixer) {}
#endif
}; };
#endif //_DSOUNDSTREAM_H_ #endif //_DSOUNDSTREAM_H_