ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Number "unknown" axes in OSX rather than call them all "unk".

This commit is contained in:
Jordan Woyak 2013-02-05 13:51:08 -06:00
parent 937d9e9007
commit f506783c37
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/InputCommon/Src/ControllerInterface/OSX/OSXJoystick.mm
View File

@ -121,7 +121,9 @@ Joystick::Axis::Axis(IOHIDElementRef element, IOHIDDeviceRef device, direction d
// Need to parse the element a bit first
std::string description("unk");
switch (IOHIDElementGetUsage(m_element)) {
int const usage = IOHIDElementGetUsage(m_element);
switch (usage)
{
case kHIDUsage_GD_X:
description = "X";
break;
@ -146,6 +148,13 @@ Joystick::Axis::Axis(IOHIDElementRef element, IOHIDDeviceRef device, direction d
case kHIDUsage_Csmr_ACPan:
description = "Pan";
break;
default:
{
std::ostringstream s;
s << usage;
description = s.str();
break;
}
}
m_name = std::string("Axis ") + description;