From 7e08fc19fc58413bf432f6b9e0e29deb4213d0e6 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 12 Oct 2010 19:42:29 +0000 Subject: Moved WiimoteNew into Dolphin and eliminated the old wiimote plugin. Removed wiimote plugin support. Moved input dialog related InputUICommon stuff into DolphinWX. Removed now unused InputCommon files. UDPWiimote stuff is temporarily disabled until it is reorganized so Core won't depend on wx. Real wiimotes are now initialized on first need(wiimote diag open or game start) and left initialized until Dolphin exit.(maybe this will work better for Linux/OS X) (scons probably needs some fixes) git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6270 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/InputCommon/Src/InputConfig.cpp | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'Source/Core/InputCommon/Src/InputConfig.cpp') diff --git a/Source/Core/InputCommon/Src/InputConfig.cpp b/Source/Core/InputCommon/Src/InputConfig.cpp index 73d52aae84..c8813b532c 100644 --- a/Source/Core/InputCommon/Src/InputConfig.cpp +++ b/Source/Core/InputCommon/Src/InputConfig.cpp @@ -17,19 +17,6 @@ #include "InputConfig.h" -InputPlugin::InputPlugin( const char* const _ini_name, const char* const _gui_name, const char* const _profile_name ) - : ini_name(_ini_name) - , gui_name(_gui_name) - , profile_name(_profile_name) -{ - // GCPads - //for ( unsigned int i = 0; i<4; ++i ) - //controllers.push_back( new GCPad( i ) ); - // Wiimotes / disabled, cause it only the GUI half is done - //for ( unsigned int i = 0; i<4; ++i ) - // controllers.push_back( new Wiimote( i ) ); -}; - InputPlugin::~InputPlugin() { // delete pads @@ -52,14 +39,14 @@ bool InputPlugin::LoadConfig() // load settings from ini (*i)->LoadConfig(inifile.GetOrCreateSection((*i)->GetName().c_str())); // update refs - (*i)->UpdateReferences(controller_interface); + (*i)->UpdateReferences(g_controller_interface); } return true; } else { - controllers[0]->LoadDefaults(controller_interface); - controllers[0]->UpdateReferences(controller_interface); + controllers[0]->LoadDefaults(g_controller_interface); + controllers[0]->UpdateReferences(g_controller_interface); return false; } } -- cgit v1.2.3