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

Remove some RARCH_MENU_CTL_ actions

Browse Source
This commit is contained in:
twinaphex 2017-05-15 08:03:35 +02:00
parent f584d1cea5
commit 076a83a62b
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
menu/menu_driver.c
View File

@ -247,7 +247,8 @@ static void menu_driver_toggle(bool on)
if (!on) if (!on)
menu_display_toggle_set_reason(MENU_TOGGLE_REASON_NONE); menu_display_toggle_set_reason(MENU_TOGGLE_REASON_NONE);
menu_driver_ctl(RARCH_MENU_CTL_TOGGLE, &on); if (menu_driver_ctx && menu_driver_ctx->toggle)
menu_driver_ctx->toggle(menu_userdata, on);
if (on) if (on)
menu_driver_alive = true; menu_driver_alive = true;
@ -652,7 +653,8 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
case RARCH_MENU_CTL_OWNS_DRIVER: case RARCH_MENU_CTL_OWNS_DRIVER:
return menu_driver_data_own; return menu_driver_data_own;
case RARCH_MENU_CTL_DEINIT: case RARCH_MENU_CTL_DEINIT:
menu_driver_ctl(RARCH_MENU_CTL_CONTEXT_DESTROY, NULL); if (menu_driver_ctx && menu_driver_ctx->context_destroy)
menu_driver_ctx->context_destroy(menu_userdata);
if (menu_driver_ctl(RARCH_MENU_CTL_OWNS_DRIVER, NULL)) if (menu_driver_ctl(RARCH_MENU_CTL_OWNS_DRIVER, NULL))
return true; return true;
menu_driver_ctl(RARCH_MENU_CTL_PLAYLIST_FREE, NULL); menu_driver_ctl(RARCH_MENU_CTL_PLAYLIST_FREE, NULL);
@ -800,16 +802,6 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
return true; return true;
} }
return false; return false;
case RARCH_MENU_CTL_TOGGLE:
{
bool *on = (bool*)data;
if (!on)
return false;
if (menu_driver_ctx && menu_driver_ctx->toggle)
menu_driver_ctx->toggle(menu_userdata, *on);
}
break;
case RARCH_MENU_CTL_REFRESH: case RARCH_MENU_CTL_REFRESH:
{ {
#if 0 #if 0
@ -821,11 +813,6 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
#endif #endif
} }
break; break;
case RARCH_MENU_CTL_CONTEXT_DESTROY:
if (!menu_driver_ctx || !menu_driver_ctx->context_destroy)
return false;
menu_driver_ctx->context_destroy(menu_userdata);
break;
case RARCH_MENU_CTL_LIST_SET_SELECTION: case RARCH_MENU_CTL_LIST_SET_SELECTION:
{ {
file_list_t *list = (file_list_t*)data; file_list_t *list = (file_list_t*)data;

2
menu/menu_driver.h
View File

@ -109,8 +109,6 @@ enum rarch_menu_ctl_state
RARCH_MENU_CTL_PLAYLIST_FREE, RARCH_MENU_CTL_PLAYLIST_FREE,
RARCH_MENU_CTL_PLAYLIST_INIT, RARCH_MENU_CTL_PLAYLIST_INIT,
RARCH_MENU_CTL_PLAYLIST_GET, RARCH_MENU_CTL_PLAYLIST_GET,
RARCH_MENU_CTL_TOGGLE,
RARCH_MENU_CTL_CONTEXT_DESTROY,
RARCH_MENU_CTL_FIND_DRIVER, RARCH_MENU_CTL_FIND_DRIVER,
RARCH_MENU_CTL_LOAD_IMAGE, RARCH_MENU_CTL_LOAD_IMAGE,
RARCH_MENU_CTL_LIST_FREE, RARCH_MENU_CTL_LIST_FREE,