Merge branch 'immediate-removal' into GLSL-master

Conflicts:
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp

immediate-removal is a new created branch seperated from master but reverted the revert of immediate-removal
so we get less conflicts by merging

1 files changed, 0 insertions, 70 deletions

diff --git a/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp b/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp
deleted file mode 100644
index 08902e1c3f..0000000000
--- a/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (C) 2003 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include "AudioCommon.h"
-#include "CommonPaths.h"
-#include "FileUtil.h"
-#include "../../Core/Src/ConfigManager.h"
-
-AudioCommonConfig ac_Config;
-
-// This shouldn't be a global, at least not here.
-SoundStream *soundStream;
-
-// Load from given file
-void AudioCommonConfig::Load()
-{
-	IniFile file;
-	file.Load(File::GetUserPath(F_DSPCONFIG_IDX));
-
-	file.Get("Config", "EnableJIT", &m_EnableJIT, true);
-	file.Get("Config", "DumpAudio", &m_DumpAudio, false);
-#if defined __linux__ && HAVE_ALSA
-	file.Get("Config", "Backend", &sBackend, BACKEND_ALSA);
-#elif defined __APPLE__
-	file.Get("Config", "Backend", &sBackend, BACKEND_COREAUDIO);
-#elif defined _WIN32
-	file.Get("Config", "Backend", &sBackend, BACKEND_DIRECTSOUND);
-#else
-	file.Get("Config", "Backend", &sBackend, BACKEND_NULLSOUND);
-#endif
-	file.Get("Config", "Frequency", &iFrequency, 48000);
-	file.Get("Config", "Volume", &m_Volume, 100);
-}
-
-// Set the values for the file
-void AudioCommonConfig::SaveSettings()
-{
-	IniFile file;
-	file.Load(File::GetUserPath(F_DSPCONFIG_IDX));
-
-	file.Set("Config", "EnableJIT", m_EnableJIT);
-	file.Set("Config", "DumpAudio", m_DumpAudio);
-	file.Set("Config", "Backend", sBackend);
-	file.Set("Config", "Frequency", iFrequency);
-	file.Set("Config", "Volume", m_Volume);
-
-	file.Save(File::GetUserPath(F_DSPCONFIG_IDX));
-}
-
-// Update according to the values (stream/mixer)
-void AudioCommonConfig::Update() {
-	if (soundStream) {
-		soundStream->GetMixer()->SetThrottle(SConfig::GetInstance().m_Framelimit == 2);
-		soundStream->SetVolume(m_Volume);
-	}
-}