mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 18:40:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
twinaphex 2016-02-13 07:27:22 +01:00
parent fcac9a8401
commit 3393a32547
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
input/input_driver.c
View File

@ -624,7 +624,6 @@ retro_input_t input_keys_pressed(void)
return ret;
}
void *input_driver_get_data(void)
{
return current_input_data;
@ -662,21 +661,6 @@ static void input_driver_command_init(void)
}
#endif
#ifdef HAVE_NETWORK_GAMEPAD
static void input_driver_remote_init(void)
{
settings_t *settings = config_get_ptr();
if (settings->network_remote_enable)
{
if (!(input_driver_remote
= rarch_remote_new(settings->network_remote_base_port)))
RARCH_ERR("Failed to initialize remote gamepad interface.\n");
}
}
#endif
bool input_driver_ctl(enum rarch_input_ctl_state state, void *data)
{
static bool input_driver_block_hotkey = false;
@ -686,6 +670,7 @@ bool input_driver_ctl(enum rarch_input_ctl_state state, void *data)
static bool input_driver_nonblock_state = false;
static bool input_driver_flushing_input = false;
static bool input_driver_data_own = false;
settings_t *settings = config_get_ptr();
switch (state)
{
@ -741,7 +726,6 @@ bool input_driver_ctl(enum rarch_input_ctl_state state, void *data)
{
int i;
driver_ctx_info_t drv;
settings_t *settings = config_get_ptr();
drv.label = "input_driver";
drv.s = settings->input.driver;
@ -850,7 +834,17 @@ bool input_driver_ctl(enum rarch_input_ctl_state state, void *data)
break;
case RARCH_INPUT_CTL_REMOTE_INIT:
#ifdef HAVE_NETWORK_GAMEPAD
input_driver_remote_init();
if (settings->network_remote_enable)
{
input_driver_remote
= rarch_remote_new(settings->network_remote_base_port);
if (!input_driver_remote)
{
RARCH_ERR("Failed to initialize remote gamepad interface.\n");
return false;
}
}
#endif
break;
case RARCH_INPUT_CTL_NONE: