From 46da45a52906fe8436e254e4847049ec1520cd05 Mon Sep 17 00:00:00 2001 From: John Peterson Date: Fri, 23 Jan 2009 11:53:58 +0000 Subject: [PATCH] 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 --- Source/Core/Core/Src/PluginManager.cpp | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/Source/Core/Core/Src/PluginManager.cpp b/Source/Core/Core/Src/PluginManager.cpp index 8aab58a9ed..b4b0ce0257 100644 --- a/Source/Core/Core/Src/PluginManager.cpp +++ b/Source/Core/Core/Src/PluginManager.cpp @@ -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 } // ----------------------------------------