Merge branch 'master' into wii-network

Conflicts:
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
	Source/VSProps/Dolphin.Win32.props
	Source/VSProps/Dolphin.x64.props

4 files changed, 3 insertions, 13 deletions

diff --git a/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp b/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp
index 533c6b4313..08902e1c3f 100644
--- a/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp
+++ b/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp
@@ -31,7 +31,6 @@ void AudioCommonConfig::Load()
 	IniFile file;
 	file.Load(File::GetUserPath(F_DSPCONFIG_IDX));
 
-	file.Get("Config", "EnableDTKMusic", &m_EnableDTKMusic, true);
 	file.Get("Config", "EnableJIT", &m_EnableJIT, true);
 	file.Get("Config", "DumpAudio", &m_DumpAudio, false);
 #if defined __linux__ && HAVE_ALSA
@@ -53,7 +52,6 @@ void AudioCommonConfig::SaveSettings()
 	IniFile file;
 	file.Load(File::GetUserPath(F_DSPCONFIG_IDX));
 
-	file.Set("Config", "EnableDTKMusic", m_EnableDTKMusic);
 	file.Set("Config", "EnableJIT", m_EnableJIT);
 	file.Set("Config", "DumpAudio", m_DumpAudio);
 	file.Set("Config", "Backend", sBackend);
@@ -67,7 +65,6 @@ void AudioCommonConfig::SaveSettings()
 void AudioCommonConfig::Update() {
 	if (soundStream) {
 		soundStream->GetMixer()->SetThrottle(SConfig::GetInstance().m_Framelimit == 2);
-		soundStream->GetMixer()->SetDTKMusic(m_EnableDTKMusic);
 		soundStream->SetVolume(m_Volume);
 	}
 }
diff --git a/Source/Core/AudioCommon/Src/AudioCommonConfig.h b/Source/Core/AudioCommon/Src/AudioCommonConfig.h
index 076ef2d4e1..76c50c6408 100644
--- a/Source/Core/AudioCommon/Src/AudioCommonConfig.h
+++ b/Source/Core/AudioCommon/Src/AudioCommonConfig.h
@@ -33,7 +33,6 @@
 
 struct AudioCommonConfig 
 {
-	bool m_EnableDTKMusic;
 	bool m_EnableJIT;
 	bool m_DumpAudio;
 	int m_Volume;
diff --git a/Source/Core/AudioCommon/Src/Mixer.cpp b/Source/Core/AudioCommon/Src/Mixer.cpp
index 6ee0ddbf7a..8340df8b59 100644
--- a/Source/Core/AudioCommon/Src/Mixer.cpp
+++ b/Source/Core/AudioCommon/Src/Mixer.cpp
@@ -136,8 +136,7 @@ unsigned int CMixer::Mix(short* samples, unsigned int numSamples)
 		if (m_AIplaying) {
 			Premix(samples, numLeft);
 
-			if (m_EnableDTKMusic)
-				AudioInterface::Callback_GetStreaming(samples, numLeft, m_sampleRate);
+			AudioInterface::Callback_GetStreaming(samples, numLeft, m_sampleRate);
 
 			g_wave_writer.AddStereoSamples(samples, numLeft);
 		}
@@ -147,11 +146,8 @@ unsigned int CMixer::Mix(short* samples, unsigned int numSamples)
 		Premix(samples, numSamples);
 
 		// Add the DTK Music
-		if (m_EnableDTKMusic)
-		{
-			// Re-sampling is done inside
-			AudioInterface::Callback_GetStreaming(samples, numSamples, m_sampleRate);
-		}
+		// Re-sampling is done inside
+		AudioInterface::Callback_GetStreaming(samples, numSamples, m_sampleRate);
 	}
 
 
diff --git a/Source/Core/AudioCommon/Src/Mixer.h b/Source/Core/AudioCommon/Src/Mixer.h
index 95d89d7334..f850b58add 100644
--- a/Source/Core/AudioCommon/Src/Mixer.h
+++ b/Source/Core/AudioCommon/Src/Mixer.h
@@ -61,7 +61,6 @@ public:
 	unsigned int GetSampleRate() {return m_sampleRate;}
 
 	void SetThrottle(bool use) { m_throttle = use;}
-	void SetDTKMusic(bool use) { m_EnableDTKMusic = use;}
 
 	// TODO: do we need this
 	bool IsHLEReady() { return m_HLEready;}
@@ -103,7 +102,6 @@ protected:
 	bool m_HLEready;
 	bool m_logAudio;
 
-	bool m_EnableDTKMusic;
 	bool m_throttle;
 
 	short m_buffer[MAX_SAMPLES * 2];