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

No more references to driver->input from outside

Browse Source
This commit is contained in:
twinaphex 2015-11-29 19:07:02 +01:00
parent 778c9a25d6
commit 7a6f444823
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gfx/video_driver.c
View File

@ -428,7 +428,8 @@ error:
static void init_video_input(const input_driver_t *tmp)
{
driver_t *driver = driver_get_ptr();
if (input_get_ptr())
const input_driver_t **input = input_get_double_ptr();
if (*input)
return;
/* Reset video frame count */
@ -439,7 +440,7 @@ static void init_video_input(const input_driver_t *tmp)
RARCH_LOG("Graphics driver did not initialize an input driver. Attempting to pick a suitable driver.\n");
if (tmp)
driver->input = tmp;
*input = tmp;
else
input_driver_ctl(RARCH_INPUT_CTL_FIND_DRIVER, NULL);
@ -723,7 +724,7 @@ static bool init_video(void)
RARCH_LOG("Starting threaded video driver ...\n");
if (!rarch_threaded_video_init(&current_video, &video_data,
&driver->input, input_driver_get_data_ptr(),
input_get_double_ptr(), input_driver_get_data_ptr(),
current_video, &video))
{
RARCH_ERR("Cannot open threaded video driver ... Exiting ...\n");
@ -732,7 +733,7 @@ static bool init_video(void)
}
else
#endif
video_data = current_video->init(&video, &driver->input,
video_data = current_video->init(&video, input_get_double_ptr(),
input_driver_get_data_ptr());
if (!video_data)

8
input/input_driver.c
View File

@ -139,6 +139,14 @@ const input_driver_t *input_get_ptr(void)
return driver->input;
}
const input_driver_t **input_get_double_ptr(void)
{
driver_t *driver = driver_get_ptr();
if (!driver)
return NULL;
return &driver->input;
}
/**
* input_driver_set_rumble_state:
* @port : User number.

2
input/input_driver.h
View File

@ -272,6 +272,8 @@ void *input_driver_get_data(void);
const input_driver_t *input_get_ptr(void);
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);