Skip to content
Permalink
Browse files

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
  • Loading branch information...
glennricster committed Feb 2, 2011
1 parent 6f93d77 commit 5a800b765a8144289f1d05020b50c5815f281eca
Showing with 161 additions and 164 deletions.
  1. +6 −6 Readme.txt
  2. +1 −1 Source/Core/Core/CMakeLists.txt
  3. +2 −2 Source/Core/Core/Core.vcproj
  4. +2 −2 Source/Core/Core/Core.vcxproj
  5. +3 −3 Source/Core/Core/Core.vcxproj.filters
  6. +4 −6 Source/Core/Core/Src/ConfigManager.cpp
  7. +0 −4 Source/Core/Core/Src/ConfigManager.h
  8. +4 −4 Source/Core/Core/Src/Core.cpp
  9. +2 −2 Source/Core/Core/Src/CoreParameter.h
  10. +2 −2 Source/Core/Core/Src/{PluginDSP.cpp → DSPEmulator.cpp}
  11. +3 −3 Source/Core/Core/Src/{PluginDSP.h → DSPEmulator.h}
  12. +3 −3 Source/Core/Core/Src/HW/CPU.cpp
  13. +28 −28 Source/Core/Core/Src/HW/DSP.cpp
  14. +4 −4 Source/Core/Core/Src/HW/DSP.h
  15. +2 −2 Source/Core/Core/Src/HW/DSPHLE/DSPHLE.h
  16. +2 −2 Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp
  17. +2 −2 Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp
  18. +1 −1 Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_CARD.cpp
  19. +1 −1 Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_GBA.cpp
  20. +8 −8 Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda.cpp
  21. +1 −1 Source/Core/Core/Src/HW/DSPLLE/DSPHost.cpp
  22. +2 −2 Source/Core/Core/Src/HW/DSPLLE/DSPLLE.h
  23. +4 −4 Source/Core/Core/Src/HW/SystemTimers.cpp
  24. +2 −2 Source/Core/Core/Src/LuaInterface.cpp
  25. +1 −1 Source/Core/Core/Src/SConscript
  26. +8 −4 Source/Core/DolphinWX/Src/ConfigMain.cpp
  27. +4 −4 Source/Core/DolphinWX/Src/Frame.cpp
  28. +9 −9 Source/Core/DolphinWX/Src/Frame.h
  29. +30 −30 Source/Core/DolphinWX/Src/FrameTools.cpp
  30. +17 −16 Source/Core/DolphinWX/Src/Main.cpp
  31. +1 −1 Source/Core/DolphinWX/Src/MainNoGUI.cpp
  32. +1 −0 Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
  33. +1 −4 Source/Plugins/Plugin_VideoOGL/Src/main.cpp
@@ -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)
@@ -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
@@ -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
@@ -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" />
@@ -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>
@@ -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();
@@ -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;

@@ -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);
}


@@ -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;
@@ -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();

@@ -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_
@@ -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);
}
}

0 comments on commit 5a800b7

Please sign in to comment.
You can’t perform that action at this time.