From b7237fb5ca6eeaf8986839369549d0b08f9cff6e Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Sun, 23 Aug 2015 09:32:58 -0700 Subject: [PATCH] Fixing build problem with 3d connexion --- interface/src/devices/3DConnexionClient.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/interface/src/devices/3DConnexionClient.cpp b/interface/src/devices/3DConnexionClient.cpp index ff54804bef..52b4dce68d 100755 --- a/interface/src/devices/3DConnexionClient.cpp +++ b/interface/src/devices/3DConnexionClient.cpp @@ -185,7 +185,8 @@ void ConnexionClient::destroy() { ConnexionData& connexiondata = ConnexionData::getInstance(); int deviceid = connexiondata.getDeviceID(); connexiondata.setDeviceID(0); - Application::getUserInputMapper()->removeDevice(deviceid); + auto userInputMapper = DependencyManager::get(); + userInputMapper->removeDevice(deviceid); } #define LOGITECH_VENDOR_ID 0x46d @@ -289,14 +290,15 @@ unsigned short HidToVirtualKey(unsigned long pid, unsigned short hidKeyCode) { bool ConnexionClient::RawInputEventFilter(void* msg, long* result) { ConnexionData& connexiondata = ConnexionData::getInstance(); + auto userInputMapper = DependencyManager::get(); if (Is3dmouseAttached() && connexiondata.getDeviceID() == 0) { - connexiondata.registerToUserInputMapper(*Application::getUserInputMapper()); - connexiondata.assignDefaultInputMapping(*Application::getUserInputMapper()); + connexiondata.registerToUserInputMapper(*userInputMapper); + connexiondata.assignDefaultInputMapping(*userInputMapper); UserActivityLogger::getInstance().connectedDevice("controller", "3Dconnexion"); } else if (!Is3dmouseAttached() && connexiondata.getDeviceID() != 0) { int deviceid = connexiondata.getDeviceID(); connexiondata.setDeviceID(0); - Application::getUserInputMapper()->removeDevice(deviceid); + userInputMapper->removeDevice(deviceid); } if (!Is3dmouseAttached()) {