PluginManager: Added #ifdef INPUTCOMMON, I have no tried it yet, I'll try to figure out how it's supposed to work

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1993 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson 2009-01-23 11:53:58 +00:00
parent cc754e04d5
commit 46da45a529
1 changed files with 15 additions and 5 deletions

View File

@ -34,6 +34,8 @@
#include "ConsoleWindow.h"
CPluginManager CPluginManager::m_Instance;
//#define INPUTCOMMON
//////////////////////////////////////////////
@ -44,12 +46,16 @@ CPluginManager::CPluginManager() :
m_params(SConfig::GetInstance().m_LocalCoreStartupParameter)
{
m_PluginGlobals = new PLUGIN_GLOBALS;
//m_InputManager = new InputManager();
m_PluginGlobals->eventHandler = EventHandler::GetInstance();
m_PluginGlobals->config = (void *)&SConfig::GetInstance();
m_PluginGlobals->messageLogger = NULL;
//m_PluginGlobals->inputManager = m_InputManager;
m_PluginGlobals->messageLogger = NULL;
#ifdef INPUTCOMMON
m_InputManager = new InputManager();
m_PluginGlobals->inputManager = m_InputManager;
#endif
}
/* Function: FreeLibrary()
@ -353,7 +359,9 @@ Common::PluginPAD *CPluginManager::FreePad()
// -------------
void CPluginManager::OpenConfig(void* _Parent, const char *_rFilename, PLUGIN_TYPE Type)
{
//m_InputManager->Init();
#ifdef INPUTCOMMON
m_InputManager->Init();
#endif
switch(Type)
{
@ -371,7 +379,9 @@ void CPluginManager::OpenConfig(void* _Parent, const char *_rFilename, PLUGIN_TY
break;
}
//m_InputManager->Shutdown();
#ifdef INPUTCOMMON
m_InputManager->Shutdown();
#endif
}
// ----------------------------------------