summaryrefslogtreecommitdiffhomepage
path: root/opentrack/win32-joystick.hpp
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2015-12-06 05:23:04 +0100
committerStanislaw Halik <sthalik@misaki.pl>2015-12-06 05:23:04 +0100
commit5076d0c35eacb2e7b246e7bd5e6637086ea74a15 (patch)
treedaf7044615e63c857aef5492b46a7fee2c34417a /opentrack/win32-joystick.hpp
parent4bdcd48852a459fbd5bc6eb4452c95a3ad8b85e3 (diff)
api/joy: nix static, now that we're not a singleton
Diffstat (limited to 'opentrack/win32-joystick.hpp')
-rw-r--r--opentrack/win32-joystick.hpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/opentrack/win32-joystick.hpp b/opentrack/win32-joystick.hpp
index f7629c3d..e68ea2c6 100644
--- a/opentrack/win32-joystick.hpp
+++ b/opentrack/win32-joystick.hpp
@@ -70,9 +70,6 @@ private:
void release();
void refresh(bool first);
- struct joy;
- static std::unordered_map<QString, std::shared_ptr<joy>>& joys();
-
struct joy
{
LPDIRECTINPUTDEVICE8 joy_handle;
@@ -97,6 +94,8 @@ private:
void release();
bool poll(fn f);
};
+
+ std::unordered_map<QString, std::shared_ptr<joy>> joys;
class enum_state
{