piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-28 16:49:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

CPlugin had a non-virtual destructor. This fixes that, plus reindents a bunch of code.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2332 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard
2009-02-21 12:07:03 +00:00
parent 76a78dd60d
commit 28cbd0a6ba
12 changed files with 130 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/Core/Src/PluginManager.cpp
View File

@ -79,6 +79,8 @@ CPluginManager CPluginManager::m_Instance;
//////////////////////////////////////////////////////////////////////////////////////////
// The Plugin Manager Class
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
// The plugin manager is some sort of singleton that runs during Dolphin's entire lifespan.
CPluginManager::CPluginManager() :
m_params(SConfig::GetInstance().m_LocalCoreStartupParameter)
{
@ -87,7 +89,7 @@ CPluginManager::CPluginManager() :
m_PluginGlobals->config = (void *)&SConfig::GetInstance();
m_PluginGlobals->messageLogger = NULL;
// Set initial values to NULL, this is only done when Dolphin is started
// Set initial values to NULL.
m_video = NULL;
m_dsp = NULL;
for (int i = 0; i < MAXPADS; i++)
@ -104,8 +106,10 @@ CPluginManager::~CPluginManager()
delete m_PluginGlobals;
delete m_dsp;
for (int i = 0; i < MAXPADS; i++) {
if (m_pad[i] && OkayToInitPlugin(i)) {
for (int i = 0; i < MAXPADS; i++)
{
if (m_pad[i] && OkayToInitPlugin(i))
{
Console::Print("Delete: %i\n", i);
delete m_pad[i];
}
@ -183,7 +187,7 @@ bool CPluginManager::InitPlugins()
void CPluginManager::ShutdownPlugins()
{
for (int i = 0; i < MAXPADS; i++) {
if (m_pad[i] && OkayToInitPlugin(i)) {
if (m_pad[i]) {
m_pad[i]->Shutdown();
//delete m_pad[i];
}
@ -201,7 +205,6 @@ void CPluginManager::ShutdownPlugins()
if (m_video)
{
m_video->Shutdown();
// This is needed for Stop and Start to work
delete m_video;
m_video = NULL;
}
@ -209,7 +212,6 @@ void CPluginManager::ShutdownPlugins()
if (m_dsp)
{
m_dsp->Shutdown();
// This is needed for Stop and Start to work
delete m_dsp;
m_dsp = NULL;
}