ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanups

This commit is contained in:
twinaphex 2015-08-22 01:42:26 +02:00
parent 5b188066f1
commit 4ae1e9a53d
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
menu/menu.c
View File

@ -218,7 +218,7 @@ void menu_free(menu_handle_t *menu)
free(global->core_info.current); free(global->core_info.current);
global->core_info.current = NULL; global->core_info.current = NULL;
menu_driver_unset_alive(); menu_driver_toggle(false);
free(menu); free(menu);
} }
@ -286,7 +286,7 @@ void *menu_init(const void *data)
rarch_assert(disp->msg_queue = msg_queue_new(8)); rarch_assert(disp->msg_queue = msg_queue_new(8));
menu_driver_set_alive(); menu_driver_toggle(true);
return menu; return menu;

34
menu/menu_driver.c
View File

@ -337,12 +337,32 @@ void menu_driver_free(menu_handle_t *menu)
driver->free(menu); driver->free(menu);
} }
bool menu_driver_alive(void)
{
return menu_alive;
}
static void menu_driver_set_alive(void)
{
menu_alive = true;
}
static void menu_driver_unset_alive(void)
{
menu_alive = false;
}
void menu_driver_toggle(bool latch) void menu_driver_toggle(bool latch)
{ {
const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr(); const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr();
if (driver->toggle) if (driver->toggle)
driver->toggle(latch); driver->toggle(latch);
if (latch)
menu_driver_set_alive();
else
menu_driver_unset_alive();
} }
bool menu_driver_load_image(void *data, menu_image_type_t type) bool menu_driver_load_image(void *data, menu_image_type_t type)
@ -355,20 +375,6 @@ bool menu_driver_load_image(void *data, menu_image_type_t type)
return false; return false;
} }
bool menu_driver_alive(void)
{
return menu_alive;
}
void menu_driver_set_alive(void)
{
menu_alive = true;
}
void menu_driver_unset_alive(void)
{
menu_alive = false;
}
bool menu_environment_cb(menu_environ_cb_t type, void *data) bool menu_environment_cb(menu_environ_cb_t type, void *data)
{ {

4
menu/menu_driver.h
View File

@ -226,10 +226,6 @@ void menu_driver_context_destroy(void);
bool menu_driver_alive(void); bool menu_driver_alive(void);
void menu_driver_set_alive(void);
void menu_driver_unset_alive(void);
size_t menu_driver_list_get_selection(void); size_t menu_driver_list_get_selection(void);
bool menu_environment_cb(menu_environ_cb_t type, void *data); bool menu_environment_cb(menu_environ_cb_t type, void *data);

2
retroarch.c
View File

@ -1389,7 +1389,6 @@ void rarch_main_set_state(unsigned cmd)
} }
menu_entries_set_refresh(false); menu_entries_set_refresh(false);
menu_driver_set_alive();
#endif #endif
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
if (settings->input.overlay_hide_in_menu) if (settings->input.overlay_hide_in_menu)
@ -1428,7 +1427,6 @@ void rarch_main_set_state(unsigned cmd)
case RARCH_ACTION_STATE_MENU_RUNNING_FINISHED: case RARCH_ACTION_STATE_MENU_RUNNING_FINISHED:
#ifdef HAVE_MENU #ifdef HAVE_MENU
menu_driver_toggle(false); menu_driver_toggle(false);
menu_driver_unset_alive();
driver_set_nonblock_state(driver->nonblock_state); driver_set_nonblock_state(driver->nonblock_state);