diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2013-02-05 21:07:09 -0600 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2013-02-05 21:08:52 -0600 |
| commit | ef9d7fb789ec88b249c33a9119fb40069e68619e (patch) | |
| tree | 1fde47a4b607392a30ea1f7c0c3aba7655408e80 /Source/Core/InputCommon/Src/ControllerInterface | |
| parent | af9b9c8f4583372afe441e7a87ee3a0a4d49db41 (diff) | |
Fix compilation with SDL2. (based on a patch from matthewharveys)
Fixes issue 5971.
Diffstat (limited to 'Source/Core/InputCommon/Src/ControllerInterface')
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp index b521032e9c..c5ee3af23f 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/SDL/SDL.cpp @@ -17,6 +17,15 @@ namespace ciface { namespace SDL { + +std::string GetJoystickName(int index) +{ +#if SDL_VERSION_ATLEAST(2, 0, 0) + return SDL_JoystickNameForIndex(index); +#else + return SDL_JoystickName(index); +#endif +} void Init( std::vector<ControllerInterface::Device*>& devices ) { @@ -32,7 +41,7 @@ void Init( std::vector<ControllerInterface::Device*>& devices ) SDL_Joystick* dev = SDL_JoystickOpen(i); if (dev) { - Joystick* js = new Joystick(dev, i, name_counts[SDL_JoystickName(i)]++); + Joystick* js = new Joystick(dev, i, name_counts[GetJoystickName(i)]++); // only add if it has some inputs/outputs if (js->Inputs().size() || js->Outputs().size()) devices.push_back( js ); @@ -325,13 +334,7 @@ bool Joystick::UpdateOutput() std::string Joystick::GetName() const { - return StripSpaces( -#if SDL_VERSION_ATLEAST(2, 0, 0) - SDL_JoystickNameForIndex(m_sdl_index) -#else - SDL_JoystickName(m_sdl_index) -#endif - ); + return StripSpaces(GetJoystickName(m_sdl_index)); } std::string Joystick::GetSource() const |