mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-17 02:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup global_init_drivers/global_uninit_drivers

Browse Source
This commit is contained in:
twinaphex 2014-05-28 18:39:46 +02:00
parent bafae15635
commit 7b4e735821
4 changed files with 6 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
driver-contexts/camera_driver.c
View File

@ -138,4 +138,5 @@ void uninit_camera(void)
if (driver.camera->free) if (driver.camera->free)
driver.camera->free(driver.camera_data); driver.camera->free(driver.camera_data);
} }
driver.camera_data = NULL;
} }

1
driver-contexts/location_driver.c
View File

@ -137,4 +137,5 @@ void uninit_location(void)
if (driver.location->free) if (driver.location->free)
driver.location->free(driver.location_data); driver.location->free(driver.location_data);
} }
driver.location_data = NULL;
} }

1
driver-contexts/osk_driver.c
View File

@ -87,4 +87,5 @@ void uninit_osk(void)
{ {
if (driver.osk_data && driver.osk && driver.osk->free) if (driver.osk_data && driver.osk && driver.osk->free)
driver.osk->free(driver.osk_data); driver.osk->free(driver.osk_data);
driver.osk_data = NULL;
} }

49
driver.c
View File

@ -509,56 +509,13 @@ bool driver_update_system_av_info(const struct retro_system_av_info *info)
void global_init_drivers(void) void global_init_drivers(void)
{ {
find_audio_driver(); init_drivers_pre();
find_input_driver(); init_drivers();
find_image_driver();
#ifdef HAVE_MENU
find_menu_driver();
#endif
init_video_input();
} }
void global_uninit_drivers(void) void global_uninit_drivers(void)
{ {
if (driver.video && driver.video_data) uninit_drivers();
{
driver.video->free(driver.video_data);
driver.video_data = NULL;
}
if (driver.input && driver.input_data)
{
driver.input->free(driver.input_data);
driver.input_data = NULL;
}
#ifdef HAVE_CAMERA
if (driver.camera && driver.camera_data)
{
if (g_extern.system.camera_callback.deinitialized)
g_extern.system.camera_callback.deinitialized();
driver.camera->free(driver.camera_data);
driver.camera_data = NULL;
}
#endif
#ifdef HAVE_LOCATION
if (driver.location && driver.location_data)
{
if (g_extern.system.location_callback.deinitialized)
g_extern.system.location_callback.deinitialized();
driver.location->free(driver.location_data);
driver.location_data = NULL;
}
#endif
#ifdef HAVE_OSK
if (driver.osk && driver.osk_data)
{
driver.osk->free(driver.osk_data);
driver.osk_data = NULL;
}
#endif
} }
void init_drivers(void) void init_drivers(void)