CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-02-08 12:50:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove input_driver_data_ptr_is_same

Browse Source
This commit is contained in:
twinaphex 2016-02-13 07:40:02 +01:00
parent 016ee293cd
commit 6d8ee1f8d4
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/video_driver.c
View File

@ -542,7 +542,7 @@ static bool uninit_video_input(void)
if (
!input_driver_ctl(RARCH_INPUT_CTL_OWNS_DRIVER, NULL) &&
!input_driver_data_ptr_is_same(video_driver_data)
!input_driver_ctl(RARCH_INPUT_CTL_IS_DATA_PTR_SAME, video_driver_data)
)
input_driver_ctl(RARCH_INPUT_CTL_DEINIT, NULL);

7
input/input_driver.c
View File

@ -624,11 +624,6 @@ void **input_driver_get_data_ptr(void)
return (void**)&current_input_data;
}
bool input_driver_data_ptr_is_same(void *data)
{
return (current_input_data == data);
}
bool input_driver_ctl(enum rarch_input_ctl_state state, void *data)
{
static bool input_driver_block_hotkey = false;
@ -842,6 +837,8 @@ bool input_driver_ctl(enum rarch_input_ctl_state state, void *data)
current_input->grab_mouse(current_input_data, *bool_data);
}
break;
case RARCH_INPUT_CTL_IS_DATA_PTR_SAME:
return (current_input_data == data);
case RARCH_INPUT_CTL_NONE:
default:
break;

5
input/input_driver.h
View File

@ -83,7 +83,8 @@ enum rarch_input_ctl_state
RARCH_INPUT_CTL_REMOTE_INIT,
RARCH_INPUT_CTL_REMOTE_DEINIT,
RARCH_INPUT_CTL_KEY_PRESSED,
RARCH_INPUT_CTL_GRAB_MOUSE
RARCH_INPUT_CTL_GRAB_MOUSE,
RARCH_INPUT_CTL_IS_DATA_PTR_SAME
};
struct retro_keybind
@ -290,8 +291,6 @@ const input_driver_t **input_get_double_ptr(void);
void **input_driver_get_data_ptr(void);
bool input_driver_data_ptr_is_same(void *data);
#ifdef __cplusplus
}
#endif