mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 08:37:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Should fix DInput crash.

Browse Source
This commit is contained in:
Themaister 2011-06-10 18:01:44 +02:00
parent 2dcccc7cda
commit b6ff98cf18
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
input/sdl.c
View File

@ -153,7 +153,7 @@ static bool sdl_axis_pressed(sdl_input_t *sdl, int port_num, uint32_t joyaxis)
} }
#endif #endif
static bool sdl_is_pressed(sdl_input_t *sdl, int port_num, const struct snes_keybind *key) static bool sdl_is_pressed(sdl_input_t *sdl, unsigned port_num, const struct snes_keybind *key)
{ {
if (sdl->use_keyboard && sdl_key_pressed(key->key)) if (sdl->use_keyboard && sdl_key_pressed(key->key))
return true; return true;
@ -185,7 +185,7 @@ static bool sdl_bind_button_pressed(void *data, int key)
} }
static int16_t sdl_joypad_device_state(sdl_input_t *sdl, const struct snes_keybind **binds, static int16_t sdl_joypad_device_state(sdl_input_t *sdl, const struct snes_keybind **binds,
int port_num, int id) unsigned port_num, int id)
{ {
const struct snes_keybind *snes_keybinds = binds[port_num]; const struct snes_keybind *snes_keybinds = binds[port_num];
@ -317,12 +317,18 @@ static void sdl_poll_mouse(sdl_input_t *sdl)
static void sdl_input_poll(void *data) static void sdl_input_poll(void *data)
{ {
sdl_input_t *sdl = data;
SDL_PumpEvents(); SDL_PumpEvents();
SDL_Event event; SDL_Event event;
#ifdef HAVE_DINPUT
sdl_dinput_poll(sdl->di);
#else
SDL_JoystickUpdate(); SDL_JoystickUpdate();
#endif
sdl_poll_mouse(data); sdl_poll_mouse(data);
sdl_input_t *sdl = data;
// Search for events... // Search for events...
while (SDL_PollEvent(&event)) while (SDL_PollEvent(&event))
{ {