CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-03-07 10:57:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move input_data_own to input_driver.c

Browse Source
This commit is contained in:
twinaphex 2015-11-29 20:34:35 +01:00
parent ff13338ca9
commit df9f0fc6d1
5 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
driver.c
View File

@ -363,7 +363,7 @@ void init_drivers(int flags)
if (flags & DRIVER_AUDIO) if (flags & DRIVER_AUDIO)
audio_driver_ctl(RARCH_AUDIO_CTL_UNSET_OWN_DRIVER, NULL); audio_driver_ctl(RARCH_AUDIO_CTL_UNSET_OWN_DRIVER, NULL);
if (flags & DRIVER_INPUT) if (flags & DRIVER_INPUT)
driver->input_data_own = false; input_driver_ctl(RARCH_INPUT_CTL_UNSET_OWN_DRIVER, NULL);
if (flags & DRIVER_CAMERA) if (flags & DRIVER_CAMERA)
driver->camera_data_own = false; driver->camera_data_own = false;
if (flags & DRIVER_LOCATION) if (flags & DRIVER_LOCATION)
@ -465,7 +465,7 @@ void uninit_drivers(int flags)
if (flags & DRIVERS_VIDEO_INPUT) if (flags & DRIVERS_VIDEO_INPUT)
video_driver_ctl(RARCH_DISPLAY_CTL_DEINIT, NULL); video_driver_ctl(RARCH_DISPLAY_CTL_DEINIT, NULL);
if ((flags & DRIVER_INPUT) && !driver->input_data_own) if ((flags & DRIVER_INPUT) && !input_driver_ctl(RARCH_INPUT_CTL_OWNS_DRIVER, NULL))
input_driver_ctl(RARCH_INPUT_CTL_DESTROY, NULL); input_driver_ctl(RARCH_INPUT_CTL_DESTROY, NULL);
} }

1
driver.h
View File

@ -249,7 +249,6 @@ typedef struct driver
* *
* Typically, if a driver intends to make use of this, it should * Typically, if a driver intends to make use of this, it should
* set this to true at the end of its 'init' function. */ * set this to true at the end of its 'init' function. */
bool input_data_own;
bool camera_data_own; bool camera_data_own;
bool location_data_own; bool location_data_own;
#ifdef HAVE_MENU #ifdef HAVE_MENU

2
gfx/video_driver.c
View File

@ -528,7 +528,7 @@ static bool uninit_video_input(void)
event_command(EVENT_CMD_OVERLAY_DEINIT); event_command(EVENT_CMD_OVERLAY_DEINIT);
if ( if (
!driver->input_data_own && !input_driver_ctl(RARCH_INPUT_CTL_OWNS_DRIVER, NULL) &&
!input_driver_data_ptr_is_same(video_data) !input_driver_data_ptr_is_same(video_data)
) )
input_driver_ctl(RARCH_INPUT_CTL_DEINIT, NULL); input_driver_ctl(RARCH_INPUT_CTL_DEINIT, NULL);

13
input/input_driver.c
View File

@ -82,6 +82,7 @@ struct turbo_buttons
unsigned count; unsigned count;
}; };
static bool input_data_own;
static const input_driver_t *main_input; static const input_driver_t *main_input;
static void *main_input_data; static void *main_input_data;
static bool flushing_input; static bool flushing_input;
@ -212,15 +213,13 @@ bool input_driver_grab_mouse(bool state)
void input_driver_set(const input_driver_t **input, void **input_data) void input_driver_set(const input_driver_t **input, void **input_data)
{ {
driver_t *driver = driver_get_ptr();
if (input && input_data) if (input && input_data)
{ {
*input = main_input; *input = main_input;
*input_data = main_input_data; *input_data = main_input_data;
} }
driver->input_data_own = true; input_data_own = true;
} }
void input_driver_keyboard_mapping_set_block(bool value) void input_driver_keyboard_mapping_set_block(bool value)
@ -747,6 +746,14 @@ bool input_driver_ctl(enum rarch_input_ctl_state state, void *data)
break; break;
case RARCH_INPUT_CTL_IS_NONBLOCK_STATE: case RARCH_INPUT_CTL_IS_NONBLOCK_STATE:
return nonblock_state; return nonblock_state;
case RARCH_INPUT_CTL_SET_OWN_DRIVER:
input_data_own = true;
break;
case RARCH_INPUT_CTL_UNSET_OWN_DRIVER:
input_data_own = false;
break;
case RARCH_INPUT_CTL_OWNS_DRIVER:
return input_data_own;
case RARCH_INPUT_CTL_NONE: case RARCH_INPUT_CTL_NONE:
default: default:
break; break;

5
input/input_driver.h
View File

@ -65,7 +65,10 @@ enum rarch_input_ctl_state
RARCH_INPUT_CTL_IS_LIBRETRO_INPUT_BLOCKED, RARCH_INPUT_CTL_IS_LIBRETRO_INPUT_BLOCKED,
RARCH_INPUT_CTL_SET_NONBLOCK_STATE, RARCH_INPUT_CTL_SET_NONBLOCK_STATE,
RARCH_INPUT_CTL_UNSET_NONBLOCK_STATE, RARCH_INPUT_CTL_UNSET_NONBLOCK_STATE,
RARCH_INPUT_CTL_IS_NONBLOCK_STATE RARCH_INPUT_CTL_IS_NONBLOCK_STATE,
RARCH_INPUT_CTL_SET_OWN_DRIVER,
RARCH_INPUT_CTL_UNSET_OWN_DRIVER,
RARCH_INPUT_CTL_OWNS_DRIVER
}; };
struct retro_keybind struct retro_keybind