mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-01 16:13:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor away menu_driver_toggle

Browse Source
This commit is contained in:
twinaphex 2015-12-06 17:41:00 +01:00
parent 09ecd04d67
commit 8e8f69bb69
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
menu/menu_driver.c
View File

@ -276,7 +276,7 @@ int menu_driver_iterate(enum menu_action action)
return -1;
}
void menu_driver_toggle(bool latch)
static void menu_driver_toggle(bool latch)
{
const menu_ctx_driver_t *menu_driver = menu_ctx_driver_get_ptr();
settings_t *settings = config_get_ptr();
@ -375,6 +375,12 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
switch (state)
{
case RARCH_MENU_CTL_SET_TOGGLE:
menu_driver_toggle(true);
break;
case RARCH_MENU_CTL_UNSET_TOGGLE:
menu_driver_toggle(false);
break;
case RARCH_MENU_CTL_SET_ALIVE:
menu_driver_alive = true;
break;

4
menu/menu_driver.h
View File

@ -66,6 +66,8 @@ enum rarch_menu_ctl_state
{
RARCH_MENU_CTL_NONE = 0,
RARCH_MENU_CTL_DEINIT,
RARCH_MENU_CTL_SET_TOGGLE,
RARCH_MENU_CTL_UNSET_TOGGLE,
RARCH_MENU_CTL_SET_ALIVE,
RARCH_MENU_CTL_UNSET_ALIVE,
RARCH_MENU_CTL_IS_ALIVE,
@ -208,8 +210,6 @@ void menu_driver_context_reset(void);
void menu_driver_free(menu_handle_t *menu);
void menu_driver_toggle(bool latch);
bool menu_driver_load_image(void *data, menu_image_type_t type);
void menu_driver_list_cache(menu_list_type_t type, unsigned action);

4
retroarch.c
View File

@ -1394,7 +1394,7 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
return true;
case RARCH_CTL_MENU_RUNNING:
#ifdef HAVE_MENU
menu_driver_toggle(true);
menu_driver_ctl(RARCH_MENU_CTL_SET_TOGGLE, NULL);
#endif
#ifdef HAVE_OVERLAY
if (settings->input.overlay_hide_in_menu)
@ -1429,7 +1429,7 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
break;
case RARCH_CTL_MENU_RUNNING_FINISHED:
#ifdef HAVE_MENU
menu_driver_toggle(false);
menu_driver_ctl(RARCH_MENU_CTL_UNSET_TOGGLE, NULL);
#endif
video_driver_set_texture_enable(false, false);
#ifdef HAVE_OVERLAY