diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2010-06-05 05:30:23 +0000 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2010-06-05 05:30:23 +0000 |
| commit | 656ff26ed8fd2e47ff68e78dcf0bb588ef627865 (patch) | |
| tree | 1018796f312abfdfaf355b1104b9a01b5f050948 /Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp | |
| parent | 6b872bb81cd2297a3d59ceebb2a75266bf1370af (diff) | |
New GCPad/Wiimote: Enabled SDL 1.2 on the Windows build to support some gamepads that weren't working with DirectInput. Made DirectInput use (and prefer) buffered data rather than polled data (some gamepads should work better). In GUI: Changed all numeric wxChoice to wxSpinCtrl (config dialog opens much faster), removed "+" buttons, made UI more compact. Fixed a few problems that were introduced with the IniFile change. Made minor changes to IniFile.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5619 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp')
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp index 24f934149c..1ccf3f460b 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp @@ -3,6 +3,7 @@ #ifdef CIFACE_USE_SDL #include "SDL.h" +#include <StringUtil.h> #ifdef _WIN32 #if SDL_VERSION_ATLEAST(1, 3, 0) @@ -209,7 +210,7 @@ bool Joystick::UpdateOutput() std::string Joystick::GetName() const { - return SDL_JoystickName( m_index ); + return StripSpaces(SDL_JoystickName(m_index)); } std::string Joystick::GetSource() const |