$OpenBSD$ --- src/linux/LinuxInputManager.cpp.orig Mon Aug 16 02:51:34 2010 +++ src/linux/LinuxInputManager.cpp Fri Sep 16 16:59:56 2011 @@ -22,7 +22,6 @@ restrictions: */ #include "linux/LinuxInputManager.h" #include "linux/LinuxKeyboard.h" -#include "linux/LinuxJoyStickEvents.h" #include "linux/LinuxMouse.h" #include "OISException.h" #include @@ -48,8 +47,6 @@ LinuxInputManager::LinuxInputManager() : InputManager( //--------------------------------------------------------------------------------// LinuxInputManager::~LinuxInputManager() { - //Close all joysticks - LinuxJoyStick::_clearJoys(unusedJoyStickList); } //--------------------------------------------------------------------------------// @@ -92,9 +89,6 @@ void LinuxInputManager::_parseConfigSettings( ParamLis //--------------------------------------------------------------------------------// void LinuxInputManager::_enumerateDevices() { - //Enumerate all attached devices - unusedJoyStickList = LinuxJoyStick::_scanJoys(); - joySticks = unusedJoyStickList.size(); } //----------------------------------------------------------------------------// @@ -174,19 +168,6 @@ Object* LinuxInputManager::createObject(InputManager * obj = new LinuxMouse(this, bufferMode, grabMouse, hideMouse); break; } - case OISJoyStick: - { - for(JoyStickInfoList::iterator i = unusedJoyStickList.begin(); i != unusedJoyStickList.end(); ++i) - { - if(vendor == "" || i->vendor == vendor) - { - obj = new LinuxJoyStick(this, bufferMode, *i); - unusedJoyStickList.erase(i); - break; - } - } - break; - } default: break; } @@ -204,7 +185,6 @@ void LinuxInputManager::destroyObject( Object* obj ) { if( obj->type() == OISJoyStick ) { - unusedJoyStickList.push_back( ((LinuxJoyStick*)obj)->_getJoyInfo() ); } delete obj;