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

Merge pull request #1923 from Sonicadvance1/remove_sdl_assumption 

Remove an assumption in SDL.
This commit is contained in:
Ryan Houdek 2015-01-21 13:29:39 -06:00
parent 7fba4856ce 817abdd579
commit ca10ce36cc
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp
View File

@ -38,8 +38,19 @@ void Init( std::vector<Core::Device*>& devices )
// multiple joysticks with the same name shall get unique ids starting at 0 // multiple joysticks with the same name shall get unique ids starting at 0
std::map<std::string, int> name_counts; std::map<std::string, int> name_counts;
if (SDL_Init( SDL_INIT_FLAGS ) >= 0) #ifdef USE_SDL_HAPTIC
if (SDL_Init(SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC) >= 0)
{ {
// Correctly initialized
}
else
#endif
if (SDL_Init(SDL_INIT_JOYSTICK) < 0)
{
// Failed to initialize
return;
}
// joysticks // joysticks
for (int i = 0; i < SDL_NumJoysticks(); ++i) for (int i = 0; i < SDL_NumJoysticks(); ++i)
{ {
@ -54,7 +65,6 @@ void Init( std::vector<Core::Device*>& devices )
delete js; delete js;
} }
} }
}
} }
Joystick::Joystick(SDL_Joystick* const joystick, const int sdl_index, const unsigned int index) Joystick::Joystick(SDL_Joystick* const joystick, const int sdl_index, const unsigned int index)

3
Source/Core/InputCommon/ControllerInterface/SDL/SDL.h
View File

@ -17,9 +17,6 @@
#ifdef USE_SDL_HAPTIC #ifdef USE_SDL_HAPTIC
#include <SDL_haptic.h> #include <SDL_haptic.h>
#define SDL_INIT_FLAGS SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC
#else
#define SDL_INIT_FLAGS SDL_INIT_JOYSTICK
#endif #endif
namespace ciface namespace ciface