mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-26 15:55:31 +01:00
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:
parent
cc754e04d5
commit
46da45a529
@ -34,6 +34,8 @@
|
|||||||
#include "ConsoleWindow.h"
|
#include "ConsoleWindow.h"
|
||||||
|
|
||||||
CPluginManager CPluginManager::m_Instance;
|
CPluginManager CPluginManager::m_Instance;
|
||||||
|
|
||||||
|
//#define INPUTCOMMON
|
||||||
//////////////////////////////////////////////
|
//////////////////////////////////////////////
|
||||||
|
|
||||||
|
|
||||||
@ -44,12 +46,16 @@ CPluginManager::CPluginManager() :
|
|||||||
m_params(SConfig::GetInstance().m_LocalCoreStartupParameter)
|
m_params(SConfig::GetInstance().m_LocalCoreStartupParameter)
|
||||||
{
|
{
|
||||||
m_PluginGlobals = new PLUGIN_GLOBALS;
|
m_PluginGlobals = new PLUGIN_GLOBALS;
|
||||||
//m_InputManager = new InputManager();
|
|
||||||
|
|
||||||
m_PluginGlobals->eventHandler = EventHandler::GetInstance();
|
m_PluginGlobals->eventHandler = EventHandler::GetInstance();
|
||||||
m_PluginGlobals->config = (void *)&SConfig::GetInstance();
|
m_PluginGlobals->config = (void *)&SConfig::GetInstance();
|
||||||
m_PluginGlobals->messageLogger = NULL;
|
m_PluginGlobals->messageLogger = NULL;
|
||||||
//m_PluginGlobals->inputManager = m_InputManager;
|
|
||||||
|
#ifdef INPUTCOMMON
|
||||||
|
m_InputManager = new InputManager();
|
||||||
|
m_PluginGlobals->inputManager = m_InputManager;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Function: FreeLibrary()
|
/* Function: FreeLibrary()
|
||||||
@ -353,7 +359,9 @@ Common::PluginPAD *CPluginManager::FreePad()
|
|||||||
// -------------
|
// -------------
|
||||||
void CPluginManager::OpenConfig(void* _Parent, const char *_rFilename, PLUGIN_TYPE Type)
|
void CPluginManager::OpenConfig(void* _Parent, const char *_rFilename, PLUGIN_TYPE Type)
|
||||||
{
|
{
|
||||||
//m_InputManager->Init();
|
#ifdef INPUTCOMMON
|
||||||
|
m_InputManager->Init();
|
||||||
|
#endif
|
||||||
|
|
||||||
switch(Type)
|
switch(Type)
|
||||||
{
|
{
|
||||||
@ -371,7 +379,9 @@ void CPluginManager::OpenConfig(void* _Parent, const char *_rFilename, PLUGIN_TY
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
//m_InputManager->Shutdown();
|
#ifdef INPUTCOMMON
|
||||||
|
m_InputManager->Shutdown();
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
// ----------------------------------------
|
// ----------------------------------------
|
||||||
|
Loading…
x
Reference in New Issue
Block a user