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

(SDL2) Use SDL_INIT_GAMECONTROLLER 

Signed-off-by: Higor Eurípedes <heuripedes@gmail.com>
This commit is contained in:
Higor Eurípedes 2014-08-15 20:22:29 -03:00
parent 110cde65c5
commit 8b569a789c
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
input/sdl_joypad.c
View File

@ -32,6 +32,12 @@ typedef struct _sdl_joypad
#endif #endif
} sdl_joypad_t; } sdl_joypad_t;
#ifdef HAVE_SDL2
const int g_subsystem = SDL_INIT_GAMECONTROLLER;
#else
const int g_subsystem = SDL_INIT_JOYSTICK;
#endif
static sdl_joypad_t g_pads[MAX_PLAYERS]; static sdl_joypad_t g_pads[MAX_PLAYERS];
#ifdef HAVE_SDL2 #ifdef HAVE_SDL2
static bool g_has_haptic; static bool g_has_haptic;
@ -117,27 +123,23 @@ static void sdl_joypad_destroy(void)
for (i = 0; i < MAX_PLAYERS; i++) for (i = 0; i < MAX_PLAYERS; i++)
sdl_joypad_disconnect(i); sdl_joypad_disconnect(i);
SDL_QuitSubSystem(SDL_INIT_JOYSTICK); SDL_QuitSubSystem(g_subsystem);
memset(g_pads, 0, sizeof(g_pads)); memset(g_pads, 0, sizeof(g_pads));
} }
static bool sdl_joypad_init(void) static bool sdl_joypad_init(void)
{ {
unsigned i; unsigned i;
if (SDL_WasInit(0) == 0) if (SDL_WasInit(0) == 0)
{ {
if (SDL_Init(SDL_INIT_JOYSTICK) < 0) if (SDL_Init(g_subsystem) < 0)
return false; return false;
} }
else if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) < 0) else if (SDL_InitSubSystem(g_subsystem) < 0)
return false; return false;
#if HAVE_SDL2 #if HAVE_SDL2
// TODO: Add SDL_GameController support.
//if (SDL_Init(SDL_INIT_GAMECONTROLLER) < 0)
// RARCH_LOG("[SDL]: Failed to initialize game controller interface: %s\n",
// SDL_GetError());
g_has_haptic = false; g_has_haptic = false;
if (SDL_InitSubSystem(SDL_INIT_HAPTIC) < 0) if (SDL_InitSubSystem(SDL_INIT_HAPTIC) < 0)
RARCH_WARN("[SDL]: Failed to initialize haptic device support: %s\n", RARCH_WARN("[SDL]: Failed to initialize haptic device support: %s\n",