From 3a5fb88b5e1443173adf1d069a90735147c30dd0 Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Sat, 28 Mar 2009 16:23:06 +0000
Subject: [PATCH] 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
---
 Source/Core/AudioCommon/Src/AudioCommon.cpp |  6 ------
 Source/Core/AudioCommon/Src/DSoundStream.h  | 17 +++++++++++++----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Source/Core/AudioCommon/Src/AudioCommon.cpp b/Source/Core/AudioCommon/Src/AudioCommon.cpp
index b6bc81cf09..fae1a405e0 100644
--- a/Source/Core/AudioCommon/Src/AudioCommon.cpp
+++ b/Source/Core/AudioCommon/Src/AudioCommon.cpp
@@ -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())
diff --git a/Source/Core/AudioCommon/Src/DSoundStream.h b/Source/Core/AudioCommon/Src/DSoundStream.h
index e4ceb14143..1766fdc2c6 100644
--- a/Source/Core/AudioCommon/Src/DSoundStream.h
+++ b/Source/Core/AudioCommon/Src/DSoundStream.h
@@ -31,6 +31,7 @@
 
 class DSound : public SoundStream
 {
+#ifdef _WIN32
     Common::Thread *thread;
     Common::CriticalSection soundCriticalSection;
     Common::Event soundSyncEvent;
@@ -60,10 +61,13 @@ class DSound : public SoundStream
 			   DWORD dwSoundBytes);
 
 public:
-	DSound(CMixer *mixer, void *hWnd = NULL) : SoundStream(mixer),
-											   bufferSize(0),
-											   totalRenderedBytes(0),
-											   currentPos(0),lastPos(0) {}
+	DSound(CMixer *mixer, void *hWnd = NULL)
+		: SoundStream(mixer)
+		, bufferSize(0)
+		, totalRenderedBytes(0)
+		, currentPos(0)
+		, lastPos(0)
+	{}
 
     virtual ~DSound() {}
  
@@ -73,6 +77,11 @@ public:
     static bool isValid() { return true; }
     virtual bool usesMixer() const { return true; }
     virtual void Update();
+
+#else
+	DSound(CMixer *mixer)
+		: SoundStream(mixer) {}
+#endif
 };
 
 #endif //_DSOUNDSTREAM_H_