mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2019-07-14 15:48:44 +02:00
parent 8a70f3f4cb
commit fdd8dd65ce
2 changed files with 9 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
retroarch.c
View File

@ -3407,12 +3407,12 @@ bool rarch_environment_cb(unsigned cmd, void *data)
cb->start = driver_camera_start; cb->start = driver_camera_start;
cb->stop = driver_camera_stop; cb->stop = driver_camera_stop;
rarch_ctl(RARCH_CTL_CAMERA_SET_CB, cb); camera_cb = *cb;
if (cb->caps != 0) if (cb->caps != 0)
rarch_ctl(RARCH_CTL_CAMERA_SET_ACTIVE, NULL); camera_driver_active = true;
else else
rarch_ctl(RARCH_CTL_CAMERA_UNSET_ACTIVE, NULL); camera_driver_active = false;
break; break;
} }
@ -3430,7 +3430,7 @@ bool rarch_environment_cb(unsigned cmd, void *data)
if (system) if (system)
system->location_cb = *cb; system->location_cb = *cb;
rarch_ctl(RARCH_CTL_LOCATION_UNSET_ACTIVE, NULL); location_driver_active = false;
break; break;
} }
@ -4232,8 +4232,8 @@ static void uninit_libretro_symbols(struct retro_core_t *current_core)
rarch_ctl(RARCH_CTL_CORE_OPTIONS_DEINIT, NULL); rarch_ctl(RARCH_CTL_CORE_OPTIONS_DEINIT, NULL);
rarch_ctl(RARCH_CTL_SYSTEM_INFO_FREE, NULL); rarch_ctl(RARCH_CTL_SYSTEM_INFO_FREE, NULL);
rarch_ctl(RARCH_CTL_FRAME_TIME_FREE, NULL); rarch_ctl(RARCH_CTL_FRAME_TIME_FREE, NULL);
rarch_ctl(RARCH_CTL_CAMERA_UNSET_ACTIVE, NULL); camera_driver_active = false;
rarch_ctl(RARCH_CTL_LOCATION_UNSET_ACTIVE, NULL); location_driver_active = false;
/* Performance counters no longer valid. */ /* Performance counters no longer valid. */
performance_counters_clear(); performance_counters_clear();
@ -15799,7 +15799,7 @@ static void init_location(void)
if (!location_data) if (!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");
rarch_ctl(RARCH_CTL_LOCATION_UNSET_ACTIVE, NULL); location_driver_active = false;
} }
if (system->location_cb.initialized) if (system->location_cb.initialized)
@ -16284,7 +16284,7 @@ void drivers_init(int flags)
if (!camera_data) if (!camera_data)
{ {
RARCH_ERR("Failed to initialize camera driver. Will continue without camera.\n"); RARCH_ERR("Failed to initialize camera driver. Will continue without camera.\n");
rarch_ctl(RARCH_CTL_CAMERA_UNSET_ACTIVE, NULL); camera_driver_active = false;
} }
if (camera_cb.initialized) if (camera_cb.initialized)
@ -18515,12 +18515,6 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
switch(state) switch(state)
{ {
case RARCH_CTL_LOCATION_SET_ACTIVE:
location_driver_active = true;
break;
case RARCH_CTL_LOCATION_UNSET_ACTIVE:
location_driver_active = false;
break;
case RARCH_CTL_BSV_MOVIE_IS_INITED: case RARCH_CTL_BSV_MOVIE_IS_INITED:
return (bsv_movie_state_handle != NULL); return (bsv_movie_state_handle != NULL);
case RARCH_CTL_IS_PATCH_BLOCKED: case RARCH_CTL_IS_PATCH_BLOCKED:
@ -19128,19 +19122,6 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
break; break;
case RARCH_CTL_HTTPSERVER_DESTROY: case RARCH_CTL_HTTPSERVER_DESTROY:
break; break;
case RARCH_CTL_CAMERA_SET_ACTIVE:
camera_driver_active = true;
break;
case RARCH_CTL_CAMERA_UNSET_ACTIVE:
camera_driver_active = false;
break;
case RARCH_CTL_CAMERA_SET_CB:
{
struct retro_camera_callback *cb =
(struct retro_camera_callback*)data;
camera_cb = *cb;
}
break;
case RARCH_CTL_NONE: case RARCH_CTL_NONE:
default: default:
return false; return false;

11
retroarch.h
View File

@ -197,17 +197,8 @@ enum rarch_ctl_state
RARCH_CTL_CONTENT_RUNTIME_LOG_INIT, RARCH_CTL_CONTENT_RUNTIME_LOG_INIT,
RARCH_CTL_CONTENT_RUNTIME_LOG_DEINIT, RARCH_CTL_CONTENT_RUNTIME_LOG_DEINIT,
/* Camera */
RARCH_CTL_CAMERA_SET_ACTIVE,
RARCH_CTL_CAMERA_UNSET_ACTIVE,
RARCH_CTL_CAMERA_SET_CB,
/* BSV Movie */ /* BSV Movie */
RARCH_CTL_BSV_MOVIE_IS_INITED, RARCH_CTL_BSV_MOVIE_IS_INITED
/* Location */
RARCH_CTL_LOCATION_SET_ACTIVE,
RARCH_CTL_LOCATION_UNSET_ACTIVE
}; };
enum rarch_capabilities enum rarch_capabilities