The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-11 16:49:28 +02: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

7
Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp
View File

@ -10,6 +10,7 @@
#include "Common/Assert.h"
#include "Common/Logging/Log.h"
#include "Common/MathUtil.h"
#include "Common/StringUtil.h"
#include "InputCommon/ControllerInterface/ControllerInterface.h"
#include "InputCommon/ControllerInterface/evdev/evdev.h"
@ -97,7 +98,7 @@ evdevDevice::evdevDevice(const std::string& devnode, int id) : m_devfile(devnode
return;
}
m_name = libevdev_get_name(m_dev);
m_name = StripSpaces(libevdev_get_name(m_dev));
// Controller buttons (and keyboard keys)
int num_buttons = 0;
@ -165,7 +166,7 @@ std::string evdevDevice::Button::GetName() const
{
const char* name = libevdev_event_code_get_name(EV_KEY, m_code);
if (name)
return std::string(name);
return StripSpaces(name);
}
// But controllers use codes above 0x100, and the standard label often doesn't match.
// We are better off with Button 0 and so on.
@ -223,7 +224,7 @@ std::string evdevDevice::ForceFeedback::GetName() const
{
const char* name = libevdev_event_code_get_name(EV_FF, m_type);
if (name)
return std::string(name);
return StripSpaces(name);
return "Unknown";
}
}