From 7075c9a3612f39edf4f068705f7a1ebc4ad0614e Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 22 Nov 2015 15:12:55 +0100 Subject: tracker/joy: use the centralized joystick state worker Most of the code can be removed. --- tracker-joystick/ftnoir_tracker_joystick.cpp | 230 ++------------------- tracker-joystick/ftnoir_tracker_joystick.h | 37 +--- .../ftnoir_tracker_joystick_dialog.cpp | 46 +---- 3 files changed, 28 insertions(+), 285 deletions(-) (limited to 'tracker-joystick') diff --git a/tracker-joystick/ftnoir_tracker_joystick.cpp b/tracker-joystick/ftnoir_tracker_joystick.cpp index 742ce972..4c180eaa 100644 --- a/tracker-joystick/ftnoir_tracker_joystick.cpp +++ b/tracker-joystick/ftnoir_tracker_joystick.cpp @@ -8,223 +8,20 @@ #include "opentrack/plugin-api.hpp" #include -FTNoIR_Tracker::FTNoIR_Tracker() : - g_pDI(nullptr), - g_pJoystick(nullptr), - mtx(QMutex::Recursive), - iter(-1) +FTNoIR_Tracker::FTNoIR_Tracker() { } -void FTNoIR_Tracker::reload() -{ - s.b->reload(); - { - QMutexLocker foo(&mtx); - - if (g_pJoystick) - { - g_pJoystick->Unacquire(); - g_pJoystick->Release(); - } - if (g_pDI) - g_pDI->Release(); - - g_pJoystick = nullptr; - g_pDI = nullptr; - } - - start_tracker(frame); -} - FTNoIR_Tracker::~FTNoIR_Tracker() { - if (g_pJoystick) - { - g_pJoystick->Unacquire(); - g_pJoystick->Release(); - } - if (g_pDI) - { - g_pDI->Release(); - } -} - -#ifdef __GNUC__ -# pragma GCC diagnostic ignored "-Wmissing-field-initializers" -#endif - -static BOOL CALLBACK EnumObjectsCallback( const DIDEVICEOBJECTINSTANCE* pdidoi, - VOID* pContext ) -{ - auto self = (FTNoIR_Tracker*) pContext; - - if( pdidoi->dwType & DIDFT_AXIS ) - { - DIPROPRANGE diprg = {0}; - diprg.diph.dwSize = sizeof( DIPROPRANGE ); - diprg.diph.dwHeaderSize = sizeof( DIPROPHEADER ); - diprg.diph.dwHow = DIPH_BYID; - diprg.diph.dwObj = pdidoi->dwType; - diprg.lMax = FTNoIR_Tracker::AXIS_MAX; - diprg.lMin = -FTNoIR_Tracker::AXIS_MAX; - - if( FAILED( self->g_pJoystick->SetProperty( DIPROP_RANGE, &diprg.diph ) ) ) - return DIENUM_STOP; - - self->iter++; - } - - return self->iter == 8 ? DIENUM_STOP : DIENUM_CONTINUE; -} - -static BOOL CALLBACK EnumJoysticksCallback( const DIDEVICEINSTANCE* pdidInstance, VOID* pContext ) -{ - auto self = reinterpret_cast(pContext); - bool stop = QString(pdidInstance->tszInstanceName) == self->s.joyid; - - if (stop) - { - if (self->guid_to_check.size()) - { - QString guid = guid_to_string(pdidInstance->guidInstance); - if (guid != self->guid_to_check) - { - return DIENUM_CONTINUE; - } - else - qDebug() << "guid ok" << self->guid_to_check; - } - - (void) self->g_pDI->CreateDevice( pdidInstance->guidInstance, &self->g_pJoystick, NULL); - qDebug() << "device" << static_cast(self->s.joyid); - } - - return stop ? DIENUM_STOP : DIENUM_CONTINUE; } -void FTNoIR_Tracker::start_tracker(QFrame* frame) +void FTNoIR_Tracker::start_tracker(QFrame*) { - QMutexLocker foo(&mtx); - this->frame = frame; - iter = 0; - auto hr = CoInitialize( nullptr ); - - if( FAILED( hr = DirectInput8Create( GetModuleHandle( NULL ), DIRECTINPUT_VERSION, - IID_IDirectInput8, ( VOID** )&g_pDI, NULL ) ) ) - { - qDebug() << "create"; - goto fail; - } - - guid_to_check = s.guid; - - if( FAILED( hr = g_pDI->EnumDevices( DI8DEVCLASS_GAMECTRL, - EnumJoysticksCallback, - this, - DIEDFL_ATTACHEDONLY))) - { - qDebug() << "enum1"; - goto fail; - } - - if (!g_pJoystick && guid_to_check.size()) - { - guid_to_check = ""; - - if( FAILED( hr = g_pDI->EnumDevices( DI8DEVCLASS_GAMECTRL, - EnumJoysticksCallback, - this, - DIEDFL_ATTACHEDONLY))) - { - qDebug() << "enum2"; - goto fail; - } - } - - if (!g_pJoystick) - { - qDebug() << "ENODEV"; - goto fail; - } - - if (FAILED(g_pJoystick->SetDataFormat(&c_dfDIJoystick))) - { - qDebug() << "format"; - goto fail; - } - - if (FAILED(g_pJoystick->SetCooperativeLevel((HWND) frame->window()->winId(), DISCL_NONEXCLUSIVE | DISCL_BACKGROUND))) - { - qDebug() << "coop"; - goto fail; - } - - iter = 0; - - if( FAILED( hr = g_pJoystick->EnumObjects( EnumObjectsCallback, - ( VOID* )this, DIDFT_ALL ))) - { - qDebug() << "enum axes"; - goto fail; - } - - return; - -fail: - if (g_pJoystick) - g_pJoystick->Release(); - if (g_pDI) - g_pDI->Release(); - g_pJoystick = nullptr; - g_pDI = nullptr; - - qDebug() << "joy init failure"; } void FTNoIR_Tracker::data(double *data) { - QMutexLocker foo(&mtx); - DIJOYSTATE js = {0}; - - if( !g_pDI || !g_pJoystick) - return; - - bool ok = false; - - for (int i = 0; i < 100; i++) - { - if (!FAILED(g_pJoystick->Poll())) - { - ok = true; - break; - } - if (g_pJoystick->Acquire() != DI_OK) - continue; - else - ok = true; - break; - } - - if (!ok) - return; - - HRESULT hr = 0; - - if( FAILED( hr = g_pJoystick->GetDeviceState( sizeof( js ), &js ) ) ) - return; - - const LONG values[] = { - js.lX, - js.lY, - js.lZ, - js.lRx, - js.lRy, - js.lRz, - js.rglSlider[0], - js.rglSlider[1] - }; - int map[6] = { s.joy_1 - 1, s.joy_2 - 1, @@ -242,14 +39,21 @@ void FTNoIR_Tracker::data(double *data) 180, 180 }; - - for (int i = 0; i < 6; i++) - { - int k = map[i] - 1; - if (k < 0 || k >= 8) - data[i] = 0; - else - data[i] = values[k] * limits[i] / AXIS_MAX; + + const QString guid = s.guid; + int axes[8]; + const bool ret = joy_ctx.poll_axis(guid, axes); + + if (ret) + { + for (int i = 0; i < 6; i++) + { + int k = map[i] - 1; + if (k < 0 || k >= 8) + data[i] = 0; + else + data[i] = axes[k] * limits[i] / AXIS_MAX; + } } } diff --git a/tracker-joystick/ftnoir_tracker_joystick.h b/tracker-joystick/ftnoir_tracker_joystick.h index 29e65af1..18ac349e 100644 --- a/tracker-joystick/ftnoir_tracker_joystick.h +++ b/tracker-joystick/ftnoir_tracker_joystick.h @@ -12,21 +12,12 @@ #include #include #include -#include #include #include #include #include "opentrack/plugin-api.hpp" -#ifndef DIRECTINPUT_VERSION -# define DIRECTINPUT_VERSION 0x800 -#endif -#include -#include -#include -#include -#include -#include +#include "opentrack/win32-joystick-shortcuts.hpp" #include "opentrack-compat/options.hpp" using namespace options; @@ -46,35 +37,17 @@ struct settings : opts { {} }; -template -QString guid_to_string(const GUID guid) -{ - char buf[40] = {0}; - wchar_t szGuidW[40] = {0}; - - StringFromGUID2(guid, szGuidW, 40); - WideCharToMultiByte(0, 0, szGuidW, -1, buf, 40, NULL, NULL); - - return QString(buf); -} - class FTNoIR_Tracker : public ITracker { public: FTNoIR_Tracker(); ~FTNoIR_Tracker(); - void start_tracker(QFrame *frame); + void start_tracker(QFrame *); void data(double *data); - void reload(); - LPDIRECTINPUT8 g_pDI; - LPDIRECTINPUTDEVICE8 g_pJoystick; - QMutex mtx; - QFrame* frame; - DIDEVICEINSTANCE def; - int iter; // XXX bad style settings s; - QString guid_to_check; - static constexpr int AXIS_MAX = 65535; + QString guid; + static constexpr int AXIS_MAX = win32_joy_ctx::joy_axis_size - 1; + 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 26436c7a..28846809 100644 --- a/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp +++ b/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp @@ -1,17 +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); - - return DIENUM_CONTINUE; -} - TrackerControls::TrackerControls() : tracker(nullptr) { ui.setupUi( this ); @@ -21,33 +10,14 @@ 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(); + + for (auto& j : joy_ctx.joys()) + _joys.push_back(joys { j.second->name, j.first }); } - std::sort(_joys.begin(), - _joys.end(), - [&](const joys& j1, const joys& j2) -> bool - { - if (j1.name == j2.name) - return j1.guid < j2.guid; - return j1.name < j2.name; - }); - { int idx = 0; for (int i = 0; i < _joys.size(); i++) @@ -75,8 +45,6 @@ void TrackerControls::doOK() { s.guid = val.guid; s.joyid = val.name; s.b->save(); - if (tracker) - tracker->reload(); this->close(); } @@ -84,5 +52,3 @@ void TrackerControls::doCancel() { s.b->reload(); this->close(); } - - -- cgit v1.2.3