Merge branch 'unstable' into trackhat

* unstable: (140 commits)
  tracker/pt: increase auto threshold bucket size again
  tracker/pt: limit max amount of extracted blobs
  gui: don't update main window if we're minimized
  tracker/pt: only show widget if the frame is visible
  tracker/pt: don't resize twice in widget
  freetrack/games: regen
  contrib/make-csv: perl sort isn't stable, don't ignore case
  tracker/pt: avoid widget temp QImage allocation
  spline-widget: oops, pass by reference
  tracker/pt: don't allocate temporary dynamic size arrays
  tracker/pt: don't copy points array needlessly
  tracker/pt: don't allocate temporary frame
  tracker/pt: cv::Mat::at<T> is slow, use cv::Mat::ptr
  tracker/pt: avoid widget malloc when able
  tracker/pt: optimize widget
  tracker/pt: update video widget at 40 -> 50 ms
  cmake/mingw-w64: update
  tracker/pt: reduce mutex contention
  gui: fix left margin
  tracker/pt: remove krap
  tracker/pt: move ctor out of the loop
  tracker/pt: nix unused
  tracker/pt: don't fill mask on frame
  pose-widget: also bilinear interpolation of alpha value
  ui: adjust margin
  ui: make more compact
  glwidget: use transparent octopus background
  api/mat: fix typos/breakage
  api/joy: refresh only manually on certain events
  pt: histogram more granular 6 -> 8
  cmake/api: link with strmiids.lib on win32
  tracker/pt: reduce auto thresholding histogram bucket size
  api/keys: prevent idempotent keys
  api/joy: move from header
  api/joy: prevent idempotent keypressed passed to receiver
  compat/options: get rid of std::string usage
  compat/options: move from header
  gui/settings: set parent, otherwise not modal
  gui/settings: don't forget to show a modal dialog before executing
  gui/main: don't raise a new window, it's enough to set visible
  api/joy: speed up poll_axis path
  api/joy: nix static, now that we're not a singleton
  tracker/joy: adapt to non-singleton joy worker
  joystick: no longer singleton, use fake window handle
  api/keys: use a fake window for DirectInput handle
  gui/keys: allow for pausing global keystrokes for options dialog
  api/keys: nix tautological #ifdef
  contrib/aruco: oops, right extension
  contrib/aruco: use @frost555's marker image
  api/camera-names: move to compat/
  ...

1 files changed, 19 insertions, 34 deletions

diff --git a/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp b/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp
index 0463933f..a6fa6605 100644
--- a/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp
+++ b/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp
@@ -1,19 +1,6 @@
 #include "ftnoir_tracker_joystick.h"
 #include "opentrack/plugin-api.hpp"
 
-static BOOL CALLBACK EnumJoysticksCallback( const DIDEVICEINSTANCE* pdidInstance, VOID* pContext )
-{
-    auto self = ( TrackerControls* )pContext;
-    auto name = QString(pdidInstance->tszInstanceName);
-    auto guid = guid_to_string(pdidInstance->guidInstance);
-    TrackerControls::joys cur { name, guid };
-    self->_joys.append(cur);
-
-    self->ui.joylist->addItem(name + " " + guid);
-
-    return DIENUM_CONTINUE;
-}
-
 TrackerControls::TrackerControls() : tracker(nullptr)
 {
     ui.setupUi( this );
@@ -23,22 +10,25 @@ TrackerControls::TrackerControls() : tracker(nullptr)
     connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(doCancel()));
 
     {
-        auto hr = CoInitialize( nullptr );
-        LPDIRECTINPUT8 g_pDI = nullptr;
-
-        if( FAILED( hr = DirectInput8Create( GetModuleHandle( NULL ), DIRECTINPUT_VERSION,
-                                             IID_IDirectInput8, ( VOID** )&g_pDI, NULL ) ) )
-            goto fin;
-
-        if( FAILED( hr = g_pDI->EnumDevices( DI8DEVCLASS_GAMECTRL,
-                                             EnumJoysticksCallback,
-                                             this,
-                                             DIEDFL_ATTACHEDONLY )))
-            goto fin;
-
-fin:
-        if (g_pDI)
-            g_pDI->Release();
+        win32_joy_ctx joy_ctx;
+        
+        _joys = QList<joys>();
+        
+        for (auto j : joy_ctx.get_joy_info())
+            _joys.push_back(joys { j.name, j.guid });
+    }
+    
+    {
+        const QString guid = s.guid;
+        int idx = 0;
+        for (int i = 0; i < _joys.size(); i++)
+        {
+            const joys& j = _joys[i];
+            if (j.guid == guid)
+                idx = i;
+            ui.joylist->addItem(j.name + " " + j.guid);
+        }
+        ui.joylist->setCurrentIndex(idx);
     }
 
     tie_setting(s.joy_1, ui.joy_1);
@@ -54,10 +44,7 @@ void TrackerControls::doOK() {
     joys def { "", "" };
     auto val = _joys.value(idx, def);
     s.guid = val.guid;
-    s.joyid = val.name;
     s.b->save();
-    if (tracker)
-        tracker->reload();
     this->close();
 }
 
@@ -65,5 +52,3 @@ void TrackerControls::doCancel() {
     s.b->reload();
     this->close();
 }
-
-