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

Create location_driver_ctl

Browse Source
This commit is contained in:
twinaphex 2015-12-05 15:40:29 +01:00
parent a766d1c1c1
commit ade194b1cc
5 changed files with 50 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
driver.c
View File

@ -369,7 +369,7 @@ void init_drivers(int flags)
if (flags & DRIVER_CAMERA) if (flags & DRIVER_CAMERA)
camera_driver_ctl(RARCH_CAMERA_CTL_UNSET_OWN_DRIVER, NULL); camera_driver_ctl(RARCH_CAMERA_CTL_UNSET_OWN_DRIVER, NULL);
if (flags & DRIVER_LOCATION) if (flags & DRIVER_LOCATION)
driver->location_data_own = false; location_driver_ctl(RARCH_LOCATION_CTL_UNSET_OWN_DRIVER, NULL);
#ifdef HAVE_MENU #ifdef HAVE_MENU
/* By default, we want the menu to persist through driver reinits. */ /* By default, we want the menu to persist through driver reinits. */
@ -403,7 +403,7 @@ void init_drivers(int flags)
init_camera(); init_camera();
/* Only initialize location driver if we're ever going to use it. */ /* Only initialize location driver if we're ever going to use it. */
if ((flags & DRIVER_LOCATION) && driver->location_active) if ((flags & DRIVER_LOCATION) && location_driver_ctl(RARCH_LOCATION_CTL_IS_ACTIVE, NULL))
init_location(); init_location();
#ifdef HAVE_MENU #ifdef HAVE_MENU
@ -446,7 +446,7 @@ void uninit_drivers(int flags)
} }
#endif #endif
if ((flags & DRIVER_LOCATION) && !driver->location_data_own) if ((flags & DRIVER_LOCATION) && !location_driver_ctl(RARCH_LOCATION_CTL_OWNS_DRIVER, NULL))
{ {
uninit_location(); uninit_location();
driver->location_data = NULL; driver->location_data = NULL;

2
driver.h
View File

@ -189,8 +189,6 @@ typedef struct driver
const location_driver_t *location; const location_driver_t *location;
void *location_data; void *location_data;
bool location_active;
bool location_data_own;
const record_driver_t *recording; const record_driver_t *recording;
void *recording_data; void *recording_data;

7
dynamic.c
View File

@ -509,8 +509,6 @@ void init_libretro_sym(enum rarch_core_type type)
**/ **/
void uninit_libretro_sym(void) void uninit_libretro_sym(void)
{ {
driver_t *driver = driver_get_ptr();
#ifdef HAVE_DYNAMIC #ifdef HAVE_DYNAMIC
if (lib_handle) if (lib_handle)
dylib_close(lib_handle); dylib_close(lib_handle);
@ -546,7 +544,7 @@ void uninit_libretro_sym(void)
rarch_system_info_free(); rarch_system_info_free();
camera_driver_ctl(RARCH_CAMERA_CTL_UNSET_ACTIVE, NULL); camera_driver_ctl(RARCH_CAMERA_CTL_UNSET_ACTIVE, NULL);
driver->location_active = false; location_driver_ctl(RARCH_LOCATION_CTL_UNSET_ACTIVE, NULL);
/* Performance counters no longer valid. */ /* Performance counters no longer valid. */
retro_perf_clear(); retro_perf_clear();
@ -1140,7 +1138,8 @@ bool rarch_environment_cb(unsigned cmd, void *data)
cb->get_position = driver_location_get_position; cb->get_position = driver_location_get_position;
cb->set_interval = driver_location_set_interval; cb->set_interval = driver_location_set_interval;
system->location_callback = *cb; system->location_callback = *cb;
driver->location_active = true;
location_driver_ctl(RARCH_LOCATION_CTL_UNSET_ACTIVE, NULL);
break; break;
} }

32
location/location_driver.c
View File

@ -204,7 +204,7 @@ void init_location(void)
if (!driver->location_data) if (!driver->location_data)
{ {
RARCH_ERR("Failed to initialize location driver. Will continue without location.\n"); RARCH_ERR("Failed to initialize location driver. Will continue without location.\n");
driver->location_active = false; location_driver_ctl(RARCH_LOCATION_CTL_UNSET_ACTIVE, NULL);
} }
if (system->location_callback.initialized) if (system->location_callback.initialized)
@ -226,3 +226,33 @@ void uninit_location(void)
} }
driver->location_data = NULL; driver->location_data = NULL;
} }
bool location_driver_ctl(enum rarch_location_ctl_state state, void *data)
{
static bool location_driver_active = false;
static bool location_driver_data_own = false;
switch (state)
{
case RARCH_LOCATION_CTL_SET_OWN_DRIVER:
location_driver_data_own = true;
break;
case RARCH_LOCATION_CTL_UNSET_OWN_DRIVER:
location_driver_data_own = false;
break;
case RARCH_LOCATION_CTL_OWNS_DRIVER:
return location_driver_data_own;
case RARCH_LOCATION_CTL_SET_ACTIVE:
location_driver_active = true;
break;
case RARCH_LOCATION_CTL_UNSET_ACTIVE:
location_driver_active = false;
break;
case RARCH_LOCATION_CTL_IS_ACTIVE:
return location_driver_active;
default:
break;
}
return false;
}

13
location/location_driver.h
View File

@ -25,6 +25,17 @@
extern "C" { extern "C" {
#endif #endif
enum rarch_location_ctl_state
{
RARCH_LOCATION_CTL_NONE = 0,
RARCH_LOCATION_CTL_SET_OWN_DRIVER,
RARCH_LOCATION_CTL_UNSET_OWN_DRIVER,
RARCH_LOCATION_CTL_OWNS_DRIVER,
RARCH_LOCATION_CTL_SET_ACTIVE,
RARCH_LOCATION_CTL_UNSET_ACTIVE,
RARCH_LOCATION_CTL_IS_ACTIVE
};
typedef struct location_driver typedef struct location_driver
{ {
void *(*init)(void); void *(*init)(void);
@ -126,6 +137,8 @@ void init_location(void);
void uninit_location(void); void uninit_location(void);
bool location_driver_ctl(enum rarch_location_ctl_state state, void *data);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif