From 0edd7fd3c4c4e783493861078d54d6e608466f1c Mon Sep 17 00:00:00 2001 From: Bradley Austin Davis Date: Tue, 4 Aug 2015 00:32:38 -0700 Subject: [PATCH] Merge fix --- interface/src/devices/3DConnexionClient.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/interface/src/devices/3DConnexionClient.cpp b/interface/src/devices/3DConnexionClient.cpp index 2e0a30715c..c973e4da31 100755 --- a/interface/src/devices/3DConnexionClient.cpp +++ b/interface/src/devices/3DConnexionClient.cpp @@ -907,10 +907,10 @@ void ConnexionClient::init() { // use default switches ConnexionClientControl(fConnexionClientID, kConnexionCtlSetSwitches, kConnexionSwitchesDisabled, NULL); - if (ConnexionClient::Is3dmouseAttached() && connexiondata.getDeviceID() == 0) { - connexiondata.registerToUserInputMapper(*Application::getUserInputMapper()); - connexiondata.assignDefaultInputMapping(*Application::getUserInputMapper()); + auto userInputMapper = DependencyManager::get(); + connexiondata.registerToUserInputMapper(*userInputMapper); + connexiondata.assignDefaultInputMapping(*userInputMapper); UserActivityLogger::getInstance().connectedDevice("controller", "3Dconnexion"); } //let one axis be dominant @@ -929,7 +929,8 @@ void ConnexionClient::destroy() { fConnexionClientID = 0; ConnexionData& connexiondata = ConnexionData::getInstance(); if (connexiondata.getDeviceID()!=0) { - Application::getUserInputMapper()->removeDevice(connexiondata.getDeviceID()); + auto userInputMapper = DependencyManager::get(); + userInputMapper->removeDevice(connexiondata.getDeviceID()); connexiondata.setDeviceID(0); } } @@ -939,8 +940,9 @@ void DeviceAddedHandler(unsigned int connection) { ConnexionData& connexiondata = ConnexionData::getInstance(); if (connexiondata.getDeviceID() == 0) { qCWarning(interfaceapp) << "3Dconnexion device added "; - connexiondata.registerToUserInputMapper(*Application::getUserInputMapper()); - connexiondata.assignDefaultInputMapping(*Application::getUserInputMapper()); + auto userInputMapper = DependencyManager::get(); + connexiondata.registerToUserInputMapper(*userInputMapper); + connexiondata.assignDefaultInputMapping(*userInputMapper); UserActivityLogger::getInstance().connectedDevice("controller", "3Dconnexion"); } } @@ -949,7 +951,8 @@ void DeviceRemovedHandler(unsigned int connection) { ConnexionData& connexiondata = ConnexionData::getInstance(); if (connexiondata.getDeviceID() != 0) { qCWarning(interfaceapp) << "3Dconnexion device removed"; - Application::getUserInputMapper()->removeDevice(connexiondata.getDeviceID()); + auto userInputMapper = DependencyManager::get(); + userInputMapper->removeDevice(connexiondata.getDeviceID()); connexiondata.setDeviceID(0); } }