Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Revert "fixed, ProcessJoystickEvent was broke for axis handling"

This reverts commit 6c11ee3.
  • Loading branch information...
commit 6c0eab9b12e4b0f6896b14a6028e8fa5edb8610c 1 parent 6c11ee3
@davilla davilla authored
Showing with 2 additions and 8 deletions.
  1. +2 −8 xbmc/Application.cpp
View
10 xbmc/Application.cpp
@@ -3086,17 +3086,11 @@ bool CApplication::ProcessJoystickEvent(const std::string& joystickName, int wKe
int iWin = GetActiveWindowID();
int actionID;
CStdString actionName;
- bool fullrange;
+ bool fullRange = false;
- if (isAxis && fAmount < 0.0)
- wKeyID = -wKeyID;
// Translate using regular joystick translator.
- if (CButtonTranslator::GetInstance().TranslateJoystickString(iWin, joystickName.c_str(), wKeyID, isAxis ? JACTIVE_AXIS : JACTIVE_BUTTON, actionID, actionName, fullrange))
- {
- if (isAxis)
- fAmount = fullrange ? (fAmount + 1.0f)/2.0f : fabs(fAmount);
+ if (CButtonTranslator::GetInstance().TranslateJoystickString(iWin, joystickName.c_str(), wKeyID, isAxis ? JACTIVE_AXIS : JACTIVE_BUTTON, actionID, actionName, fullRange))
return ExecuteInputAction( CAction(actionID, fAmount, 0.0f, actionName, holdTime) );
- }
else
CLog::Log(LOGDEBUG, "ERROR mapping joystick action. Joystick: %s %i",joystickName.c_str(), wKeyID);
#endif
Please sign in to comment.
Something went wrong with that request. Please try again.