Browse Source

Fix non-SDL builds

QGC4.4
Jacob Walser 8 years ago
parent
commit
a44be8b74a
  1. 12
      src/Joystick/JoystickManager.cc

12
src/Joystick/JoystickManager.cc

@ -57,11 +57,17 @@ void JoystickManager::setToolbox(QGCToolbox *toolbox)
void JoystickManager::init() void JoystickManager::init()
{ {
#ifdef __sdljoystick__
if (JoystickSDL::init()) { if (JoystickSDL::init()) {
_setActiveJoystickFromSettings(); _setActiveJoystickFromSettings();
connect(&_joystickCheckTimer, &QTimer::timeout, this, &JoystickManager::_updateAvailableJoysticks); connect(&_joystickCheckTimer, &QTimer::timeout, this, &JoystickManager::_updateAvailableJoysticks);
_joystickCheckTimer.start(250); _joystickCheckTimer.start(250);
} }
#elif defined(__android__)
/*
* Android Joystick not yet supported
*/
#endif
} }
void JoystickManager::_setActiveJoystickFromSettings(void) void JoystickManager::_setActiveJoystickFromSettings(void)
@ -182,6 +188,7 @@ void JoystickManager::setActiveJoystickName(const QString& name)
void JoystickManager::_updateAvailableJoysticks(void) void JoystickManager::_updateAvailableJoysticks(void)
{ {
#ifdef __sdljoystick__
SDL_Event event; SDL_Event event;
while (SDL_PollEvent(&event)) { while (SDL_PollEvent(&event)) {
switch(event.type) { switch(event.type) {
@ -200,4 +207,9 @@ void JoystickManager::_updateAvailableJoysticks(void)
break; break;
} }
} }
#elif defined(__android__)
/*
* Android Joystick not yet supported
*/
#endif
} }

Loading…
Cancel
Save