piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Strip whitespace from Evdev and OSX controller names.

Browse Source
This commit is contained in:
Scott Mansell
2016-07-01 15:05:24 +12:00
parent f59b8b7536
commit e0839a9478
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/InputCommon/ControllerInterface/OSX/OSX.mm
View File

@ -6,6 +6,8 @@
#include <Foundation/Foundation.h>
#include <IOKit/hid/IOHIDLib.h>
#include "Common/StringUtil.h"
#include "InputCommon/ControllerInterface/ControllerInterface.h"
#include "InputCommon/ControllerInterface/OSX/OSX.h"
#include "InputCommon/ControllerInterface/OSX/OSXJoystick.h"
@ -137,7 +139,7 @@ static void DeviceMatching_callback(void* inContext, IOReturn inResult, void* in
IOHIDDeviceRef inIOHIDDeviceRef)
{
NSString* pName = (NSString*)IOHIDDeviceGetProperty(inIOHIDDeviceRef, CFSTR(kIOHIDProductKey));
std::string name = (pName != nullptr) ? [pName UTF8String] : "Unknown device";
std::string name = (pName != nullptr) ? StripSpaces([pName UTF8String]) : "Unknown device";
DeviceDebugPrint(inIOHIDDeviceRef);

5
Source/Core/InputCommon/ControllerInterface/OSX/OSXJoystick.mm
View File

@ -7,6 +7,7 @@
#include <Foundation/Foundation.h>
#include <IOKit/hid/IOHIDLib.h>
#include "Common/StringUtil.h"
#include "InputCommon/ControllerInterface/OSX/OSXJoystick.h"
namespace ciface
@ -110,7 +111,7 @@ std::string Joystick::Button::GetName() const
{
std::ostringstream s;
s << IOHIDElementGetUsage(m_element);
return std::string("Button ") + s.str();
return std::string("Button ") + StripSpaces(s.str());
}
Joystick::Axis::Axis(IOHIDElementRef element, IOHIDDeviceRef device, direction dir)
@ -150,7 +151,7 @@ Joystick::Axis::Axis(IOHIDElementRef element, IOHIDDeviceRef device, direction d
{
std::ostringstream s;
s << usage;
description = s.str();
description = StripSpaces(s.str());
break;
}
}