diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2015-12-06 05:16:56 +0100 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-12-06 05:16:56 +0100 |
commit | 4bdcd48852a459fbd5bc6eb4452c95a3ad8b85e3 (patch) | |
tree | e9731f1f2896a1b36a31f854ec8590fd4915fffb /tracker-joystick | |
parent | acef508f0b6f16a7be987eeebbb3402455f9aef8 (diff) |
tracker/joy: adapt to non-singleton joy worker
Diffstat (limited to 'tracker-joystick')
-rw-r--r-- | tracker-joystick/ftnoir_tracker_joystick.cpp | 2 | ||||
-rw-r--r-- | tracker-joystick/ftnoir_tracker_joystick.h | 2 | ||||
-rw-r--r-- | tracker-joystick/ftnoir_tracker_joystick_dialog.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tracker-joystick/ftnoir_tracker_joystick.cpp b/tracker-joystick/ftnoir_tracker_joystick.cpp index 112f20ca..d10b15ca 100644 --- a/tracker-joystick/ftnoir_tracker_joystick.cpp +++ b/tracker-joystick/ftnoir_tracker_joystick.cpp @@ -8,7 +8,7 @@ #include "opentrack/plugin-api.hpp" #include <QMutexLocker> -FTNoIR_Tracker::FTNoIR_Tracker() : joy_ctx(win32_joy_ctx::make()) +FTNoIR_Tracker::FTNoIR_Tracker() { if (static_cast<QString>(s.guid) == "") { diff --git a/tracker-joystick/ftnoir_tracker_joystick.h b/tracker-joystick/ftnoir_tracker_joystick.h index 9923dd1c..1f940b63 100644 --- a/tracker-joystick/ftnoir_tracker_joystick.h +++ b/tracker-joystick/ftnoir_tracker_joystick.h @@ -46,7 +46,7 @@ public: settings s; QString guid; static constexpr int AXIS_MAX = win32_joy_ctx::joy_axis_size - 1; - win32_joy_ctx& joy_ctx; + win32_joy_ctx joy_ctx; }; class TrackerControls: public ITrackerDialog diff --git a/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp b/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp index 0a630c1e..a6fa6605 100644 --- a/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp +++ b/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp @@ -10,7 +10,7 @@ TrackerControls::TrackerControls() : tracker(nullptr) connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(doCancel())); { - win32_joy_ctx& joy_ctx(win32_joy_ctx::make()); + win32_joy_ctx joy_ctx; _joys = QList<joys>(); |