mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-21 09:39:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

(input_driver.c) Cleanups/refactors

Browse Source
This commit is contained in:
twinaphex 2015-04-11 08:14:45 +02:00
parent 271292045b
commit 3eed6fd464
1 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
input/input_driver.c
View File

@ -21,6 +21,7 @@
#include "../general.h" #include "../general.h"
#include "../libretro.h" #include "../libretro.h"
static const input_driver_t *input_drivers[] = { static const input_driver_t *input_drivers[] = {
#ifdef __CELLOS_LV2__ #ifdef __CELLOS_LV2__
&input_ps3, &input_ps3,
@ -171,6 +172,13 @@ void find_input_driver(void)
} }
} }
static const input_driver_t *input_get_ptr(driver_t *driver)
{
if (!driver)
return NULL;
return driver->input;
}
/** /**
* input_driver_set_rumble_state: * input_driver_set_rumble_state:
* @port : User number. * @port : User number.
@ -184,24 +192,35 @@ bool input_driver_set_rumble_state(unsigned port,
enum retro_rumble_effect effect, uint16_t strength) enum retro_rumble_effect effect, uint16_t strength)
{ {
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();
if (driver->input && driver->input_data) const input_driver_t *input = input_get_ptr(driver);
return driver->input->set_rumble(driver->input_data,
if (input->set_rumble)
return input->set_rumble(driver->input_data,
port, effect, strength); port, effect, strength);
return false; return false;
} }
bool input_driver_key_pressed(int key)
{
driver_t *driver = driver_get_ptr();
const input_driver_t *input = input_get_ptr(driver);
return input->key_pressed(driver->input_data, key);
}
retro_input_t input_driver_keys_pressed(void) retro_input_t input_driver_keys_pressed(void)
{ {
int key; int key;
retro_input_t ret = 0; retro_input_t ret = 0;
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();
const input_driver_t *input = input_get_ptr(driver);
for (key = 0; key < RARCH_BIND_LIST_END; key++) for (key = 0; key < RARCH_BIND_LIST_END; key++)
{ {
bool state = false; bool state = false;
if ((!driver->block_libretro_input && (key < RARCH_FIRST_META_KEY)) || if ((!driver->block_libretro_input && (key < RARCH_FIRST_META_KEY)) ||
!driver->block_hotkey) !driver->block_hotkey)
state = driver->input->key_pressed(driver->input_data, key); state = input->key_pressed(driver->input_data, key);
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
state = state || (driver->overlay_state.buttons & (1ULL << key)); state = state || (driver->overlay_state.buttons & (1ULL << key));
@ -222,27 +241,20 @@ int16_t input_driver_state(const struct retro_keybind **retro_keybinds,
unsigned port, unsigned device, unsigned index, unsigned id) unsigned port, unsigned device, unsigned index, unsigned id)
{ {
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();
if (driver->input && driver->input_data) const input_driver_t *input = input_get_ptr(driver);
return driver->input->input_state(driver->input_data, retro_keybinds,
return input->input_state(driver->input_data, retro_keybinds,
port, device, index, id); port, device, index, id);
return 0;
} }
void input_driver_poll(void) void input_driver_poll(void)
{ {
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();
if (driver->input && driver->input_data) const input_driver_t *input = input_get_ptr(driver);
driver->input->poll(driver->input_data);
input->poll(driver->input_data);
} }
bool input_driver_key_pressed(int key)
{
driver_t *driver = driver_get_ptr();
if (driver && driver->input)
return driver->input->key_pressed(driver->input_data, key);
return false;
}
const rarch_joypad_driver_t * input_driver_get_joypad_driver(void) const rarch_joypad_driver_t * input_driver_get_joypad_driver(void)
{ {