Browse Source

Comments

QGC4.4
Gregory Dymarek 8 years ago
parent
commit
a18ca238ce
  1. 6
      src/Joystick/JoystickManager.cc

6
src/Joystick/JoystickManager.cc

@ -52,8 +52,7 @@ void JoystickManager::setToolbox(QGCToolbox *toolbox)
QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership); QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
} }
void JoystickManager::init() void JoystickManager::init() {
{
#ifdef __sdljoystick__ #ifdef __sdljoystick__
if (JoystickSDL::init()) { if (JoystickSDL::init()) {
_setActiveJoystickFromSettings(); _setActiveJoystickFromSettings();
@ -181,6 +180,9 @@ void JoystickManager::setActiveJoystickName(const QString& name)
setActiveJoystick(_name2JoystickMap[name]); setActiveJoystick(_name2JoystickMap[name]);
} }
/*
* TODO: move this to the right place: JoystickSDL.cc and JoystickAndroid.cc respectively and call through Joystick.cc
*/
void JoystickManager::_updateAvailableJoysticks(void) void JoystickManager::_updateAvailableJoysticks(void)
{ {
#ifdef __sdljoystick__ #ifdef __sdljoystick__

Loading…
Cancel
Save