diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 7277a42c0a..3731e48773 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -4093,7 +4093,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) disp_list.info = info; disp_list.type = type; - if (menu_driver_ctl(RARCH_MENU_CTL_LIST_PUSH, &disp_list)) + if (menu_driver_push_list(&disp_list)) return true; switch (type) diff --git a/menu/menu_driver.c b/menu/menu_driver.c index 8ded6cf211..6709334341 100644 --- a/menu/menu_driver.c +++ b/menu/menu_driver.c @@ -527,6 +527,15 @@ bool menu_driver_load_image(menu_ctx_load_image_t *load_image_info) return false; } +bool menu_driver_push_list(menu_ctx_displaylist_t *disp_list) +{ + if (menu_driver_ctx->list_push) + if (menu_driver_ctx->list_push(menu_driver_data, + menu_userdata, disp_list->info, disp_list->type) == 0) + return true; + return false; +} + bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data) { switch (state) @@ -800,16 +809,6 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data) } } break; - case RARCH_MENU_CTL_LIST_PUSH: - { - menu_ctx_displaylist_t *disp_list = (menu_ctx_displaylist_t*)data; - - if (menu_driver_ctx->list_push) - if (menu_driver_ctx->list_push(menu_driver_data, - menu_userdata, disp_list->info, disp_list->type) == 0) - return true; - } - return false; case RARCH_MENU_CTL_REFRESH: { #if 0 diff --git a/menu/menu_driver.h b/menu/menu_driver.h index bbd26184a7..8262e57c12 100644 --- a/menu/menu_driver.h +++ b/menu/menu_driver.h @@ -117,7 +117,6 @@ enum rarch_menu_ctl_state RARCH_MENU_CTL_LIST_GET_ENTRY, RARCH_MENU_CTL_LIST_CACHE, RARCH_MENU_CTL_LIST_INSERT, - RARCH_MENU_CTL_LIST_PUSH, RARCH_MENU_CTL_ENVIRONMENT, RARCH_MENU_CTL_DRIVER_DATA_GET, RARCH_MENU_CTL_POINTER_TAP, @@ -402,6 +401,8 @@ void menu_driver_populate_entries(menu_displaylist_info_t *info); bool menu_driver_load_image(menu_ctx_load_image_t *load_image_info); +bool menu_driver_push_list(menu_ctx_displaylist_t *disp_list); + bool menu_driver_init(bool video_is_threaded); extern menu_ctx_driver_t menu_ctx_xui;