Some work on changing comments, log messages, and variable and function names to reflect that the plugins are not plugins anymore.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7170 8ced0084-cf51-0410-be5f-012b33b47a6e

3 files changed, 4 insertions, 6 deletions

diff --git a/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp b/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp
index 6e22512c06..b04ae01fd9 100644
--- a/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp
+++ b/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp
@@ -43,7 +43,7 @@ void AudioCommonConfig::Load()
 #else
 	file.Get("Config", "Backend", &sBackend, BACKEND_NULLSOUND);
 #endif
-	file.Get("Config", "Frequency", &sFrequency, 48000);
+	file.Get("Config", "Frequency", &iFrequency, 48000);
 	file.Get("Config", "Volume", &m_Volume, 100);
 }
 
@@ -58,7 +58,7 @@ void AudioCommonConfig::SaveSettings()
 	file.Set("Config", "EnableJIT", m_EnableJIT);
 	file.Set("Config", "DumpAudio", m_DumpAudio);
 	file.Set("Config", "Backend", sBackend);
-	file.Set("Config", "Frequency", sFrequency);
+	file.Set("Config", "Frequency", iFrequency);
 	file.Set("Config", "Volume", m_Volume);
 
 	file.Save((std::string(File::GetUserPath(F_DSPCONFIG_IDX)).c_str()));
diff --git a/Source/Core/AudioCommon/Src/AudioCommonConfig.h b/Source/Core/AudioCommon/Src/AudioCommonConfig.h
index 98cbf60500..49124344e0 100644
--- a/Source/Core/AudioCommon/Src/AudioCommonConfig.h
+++ b/Source/Core/AudioCommon/Src/AudioCommonConfig.h
@@ -39,7 +39,7 @@ struct AudioCommonConfig
 	bool m_DumpAudio;
 	int m_Volume;
 	std::string sBackend;
-	int sFrequency;
+	int iFrequency;
 	
 	// Load from given file
 	void Load();
diff --git a/Source/Core/AudioCommon/Src/Mixer.cpp b/Source/Core/AudioCommon/Src/Mixer.cpp
index 8dcc972535..2833a029dd 100644
--- a/Source/Core/AudioCommon/Src/Mixer.cpp
+++ b/Source/Core/AudioCommon/Src/Mixer.cpp
@@ -194,10 +194,8 @@ void CMixer::PushSamples(const short *samples, unsigned int num_samples)
 
 	if (m_sampleRate == 32000)
 		Common::AtomicAdd(m_numSamples, num_samples);
-	else if (m_sampleRate == 48000)
+	else // Assume 48000 otherwise
 		Common::AtomicAdd(m_numSamples, num_samples * 3 / 2);
-	else
-		PanicAlertT("Mixer: Unsupported sample rate.");
 
 	return;
 }