Some more work on renaming variables and files to reflect that the pl…

…ugins are no longer plugins.

Fix another minor issue with frame dumping.
Add the graphics config dialog button back to the main config.


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

Readme.txt

@@ -29,8 +29,8 @@ Usage: Dolphin [-h] [-d] [-l] [-e <str>] [-b] [-V <str>] [-A <str>]
   -l, --logger              	Opens the logger
   -e, --exec=<str>          	Loads the specified file (DOL, ELF, WAD, GCM, ISO)
   -b, --batch             	Exit Dolphin with emulator
-  -V, --video_plugin=<str>  	Specify a video plugin
-  -A, --audio_plugin=<str>  	Specify an audio plugin
+  -V, --video_backend=<str>  	Specify a video plugin
+  -A, --audio_emulation=<str>  	Specify low level (LLE) or high level (HLE) audio emulation
 
 [Libraries]
 Cg: Cg Shading API (http://developer.nvidia.com/object/cg_toolkit.html)
@@ -40,10 +40,10 @@ Cg: Cg Shading API (http://developer.nvidia.com/object/cg_toolkit.html)
 Plugin_DSP_HLE: High Level DSP Emulation
 Plugin_DSP_LLE: Low Level DSP Emulation
 
-[Video Plugins]
-Plugin_VideoDX9: Render with Direct3D 9
-Plugin_VideoDX11: Render with Direct3D 11
-Plugin_VideoOGL: Render with OpenGL + Cg Shader Language
+[Video Backends]
+Direct3D9: Render with Direct3D 9
+Direct3D11: Render with Direct3D 11
+OpenGL: Render with OpenGL + Cg Shader Language
 
 [Sys Files]
 totaldb.dsy: Database of symbols (for devs only)

Source/Core/Core/CMakeLists.txt

@@ -6,13 +6,13 @@ set(SRCS	Src/ActionReplay.cpp
 			Src/CoreParameter.cpp
 			Src/CoreRerecording.cpp
 			Src/CoreTiming.cpp
+			Src/DSPEmulator.cpp
 			Src/GeckoCodeConfig.cpp
 			Src/GeckoCode.cpp
 			Src/LuaInterface.cpp
 			Src/MemTools.cpp
 			Src/OnFrame.cpp
 			Src/PatchEngine.cpp
-			Src/PluginDSP.cpp
 			Src/State.cpp
 			Src/stdafx.cpp
 			Src/Tracer.cpp

Source/Core/Core/Core.vcproj

@@ -1974,11 +1974,11 @@
 			>
 		</File>
 		<File
-			RelativePath=".\Src\PluginDSP.cpp"
+			RelativePath=".\Src\DSPEmulator.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\Src\PluginDSP.h"
+			RelativePath=".\Src\DSPEmulator.h"
 			>
 		</File>
 		<File

Source/Core/Core/Core.vcxproj

@@ -393,7 +393,7 @@
     <ClCompile Include="Src\MemTools.cpp" />
     <ClCompile Include="Src\OnFrame.cpp" />
     <ClCompile Include="Src\PatchEngine.cpp" />
-    <ClCompile Include="Src\PluginDSP.cpp" />
+    <ClCompile Include="Src\DSPEmulator.cpp" />
     <ClCompile Include="Src\PowerPC\Interpreter\Interpreter.cpp" />
     <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_Branch.cpp" />
     <ClCompile Include="Src\PowerPC\Interpreter\Interpreter_FloatingPoint.cpp" />
@@ -584,7 +584,7 @@
     <ClInclude Include="Src\MemTools.h" />
     <ClInclude Include="Src\OnFrame.h" />
     <ClInclude Include="Src\PatchEngine.h" />
-    <ClInclude Include="Src\PluginDSP.h" />
+    <ClInclude Include="Src\DSPEmulator.h" />
     <ClInclude Include="Src\PowerPC\CPUCoreBase.h" />
     <ClInclude Include="Src\PowerPC\Gekko.h" />
     <ClInclude Include="Src\PowerPC\Interpreter\Interpreter.h" />

Source/Core/Core/Core.vcxproj.filters

@@ -10,7 +10,7 @@
     <ClCompile Include="Src\MemTools.cpp" />
     <ClCompile Include="Src\OnFrame.cpp" />
     <ClCompile Include="Src\PatchEngine.cpp" />
-    <ClCompile Include="Src\PluginDSP.cpp" />
+    <ClCompile Include="Src\DSPEmulator.cpp" />
     <ClCompile Include="Src\State.cpp" />
     <ClCompile Include="Src\stdafx.cpp" />
     <ClCompile Include="Src\Tracer.cpp" />
@@ -539,7 +539,7 @@
     <ClInclude Include="Src\MemTools.h" />
     <ClInclude Include="Src\OnFrame.h" />
     <ClInclude Include="Src\PatchEngine.h" />
-    <ClInclude Include="Src\PluginDSP.h" />
+    <ClInclude Include="Src\DSPEmulator.h" />
     <ClInclude Include="Src\State.h" />
     <ClInclude Include="Src\stdafx.h" />
     <ClInclude Include="Src\Tracer.h" />
@@ -1119,4 +1119,4 @@
       <UniqueIdentifier>{1c21a3e1-b791-4a23-b0d5-ed2b2c34007f}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
+</Project>

Source/Core/Core/Src/ConfigManager.cpp

@@ -182,9 +182,8 @@ void SConfig::SaveSettings()
 	ini.Set("Core", "FrameLimit",		m_Framelimit);
 	ini.Set("Core", "UseFPS",		b_UseFPS);
 
-	// Plugins
-	// TODO: change key name, it's no longer a plugin
-	ini.Set("Core", "GFXPlugin",	m_LocalCoreStartupParameter.m_strVideoPlugin);
+	// GFX Backend
+	ini.Set("Core", "GFXBackend",	m_LocalCoreStartupParameter.m_strVideoBackend);
 
 	ini.Save(File::GetUserPath(F_DOLPHINCONFIG_IDX));
 	m_SYSCONF->Save();
@@ -313,9 +312,8 @@ void SConfig::LoadSettings()
 		ini.Get("Core", "FrameLimit",		&m_Framelimit,									1); // auto frame limit by default
 		ini.Get("Core", "UseFPS",			&b_UseFPS,										false); // use vps as default
 
-		// Plugins
-		// TODO: change key name, it's no longer a plugin
-		ini.Get("Core", "GFXPlugin",  &m_LocalCoreStartupParameter.m_strVideoPlugin, "");
+		// GFX Backend
+		ini.Get("Core", "GFXBackend",  &m_LocalCoreStartupParameter.m_strVideoBackend, "");
 	}
 
 	m_SYSCONF = new SysConf();

Source/Core/Core/Src/ConfigManager.h

@@ -34,10 +34,6 @@ struct SConfig : NonCopyable
 	bool m_WiiAutoReconnect[4];
 	bool m_WiiAutoUnpair;
 
-	// hard coded default plugins ...
-	std::string m_DefaultGFXPlugin;
-	std::string m_DefaultDSPPlugin;
-
 	// name of the last used filename
 	std::string m_LastFilename;
 

Source/Core/Core/Src/Core.cpp

@@ -54,7 +54,7 @@
 #include "PowerPC/PowerPC.h"
 #include "PowerPC/JitCommon/JitBase.h"
 
-#include "PluginDSP.h"
+#include "DSPEmulator.h"
 #include "ConfigManager.h"
 #include "VideoBackendBase.h"
 
@@ -314,7 +314,7 @@ void EmuThread()
 	g_video_backend->Initialize();
 	g_pWindowHandle = _CoreParameter.hMainWindow;
 
-	DSP::GetPlugin()->Initialize(g_pWindowHandle, _CoreParameter.bWii, _CoreParameter.bDSPThread);
+	DSP::GetDSPEmulator()->Initialize(g_pWindowHandle, _CoreParameter.bWii, _CoreParameter.bDSPThread);
 
 	Pad::Initialize(g_pWindowHandle);
 
@@ -411,7 +411,7 @@ void EmuThread()
 
 	// Stop audio thread - Actually this does nothing on HLE plugin.
 	// But stops the DSP Interpreter on LLE plugin.
-	DSP::GetPlugin()->DSP_StopSoundStream();
+	DSP::GetDSPEmulator()->DSP_StopSoundStream();
 
 	// We must set up this flag before executing HW::Shutdown()
 	g_bHwInit = false;
@@ -653,7 +653,7 @@ void Callback_DSPLog(const TCHAR* _szMessage, int _v)
 // WARNING - THIS MAY BE EXECUTED FROM DSP THREAD
 void Callback_DSPInterrupt()
 {
-	DSP::GenerateDSPInterruptFromPlugin(DSP::INT_DSP);
+	DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
 }
 
 

Source/Core/Core/Src/CoreParameter.h

@@ -128,9 +128,9 @@ struct SCoreStartupParameter
 	};
 	EBootType m_BootType;
 
-	// files
-	std::string m_strVideoPlugin;
+	std::string m_strVideoBackend;
 
+	// files
 	std::string m_strFilename;
 	std::string m_strBootROM;
 	std::string m_strSRAM;

Source/Core/Core/Src/PluginDSP.cpp → Source/Core/Core/Src/DSPEmulator.cpp

@@ -15,12 +15,12 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#include "PluginDSP.h"
+#include "DSPEmulator.h"
 
 #include "HW/DSPLLE/DSPLLE.h"
 #include "HW/DSPHLE/DSPHLE.h"
 
-PluginDSP *CreateDSPPlugin(bool HLE) 
+DSPEmulator *CreateDSPEmulator(bool HLE) 
 {
 	ac_Config.Load();
 

Source/Core/Core/Src/PluginDSP.h → Source/Core/Core/Src/DSPEmulator.h

@@ -21,10 +21,10 @@
 
 #include "ChunkFile.h"
 
-class PluginDSP
+class DSPEmulator
 {
 public:
-	virtual ~PluginDSP() {}
+	virtual ~DSPEmulator() {}
 
 	virtual bool IsLLE() = 0;
 
@@ -45,6 +45,6 @@ class PluginDSP
 	virtual void DSP_ClearAudioBuffer(bool mute) = 0;
 };
 
-PluginDSP *CreateDSPPlugin(bool LLE);
+DSPEmulator *CreateDSPEmulator(bool LLE);
 
 #endif // _PLUGINDSP_H_

Source/Core/Core/Src/HW/CPU.cpp

@@ -18,7 +18,7 @@
 #include "Common.h"
 #include "Thread.h"
 
-#include "../PluginDSP.h"
+#include "../DSPEmulator.h"
 #include "../PowerPC/PowerPC.h"
 #include "../Host.h"
 #include "../Core.h"
@@ -118,14 +118,14 @@ void CCPU::EnableStepping(const bool _bStepping)
 	{
 		PowerPC::Pause();
 		g_video_backend->EmuStateChange(EMUSTATE_CHANGE_PAUSE);
-		DSP::GetPlugin()->DSP_ClearAudioBuffer(true);
+		DSP::GetDSPEmulator()->DSP_ClearAudioBuffer(true);
 	}
 	else
 	{
 		PowerPC::Start();
 		m_StepEvent.Set();
 		g_video_backend->EmuStateChange(EMUSTATE_CHANGE_PLAY);
-		DSP::GetPlugin()->DSP_ClearAudioBuffer(false);
+		DSP::GetDSPEmulator()->DSP_ClearAudioBuffer(false);
 	}
 }