diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 32f441f896..7277a42c0a 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -3759,7 +3759,7 @@ static bool menu_displaylist_push_list_process(menu_displaylist_info_t *info) if (info->need_push) { info->label_hash = msg_hash_calculate(info->label); - menu_driver_ctl(RARCH_MENU_CTL_POPULATE_ENTRIES, info); + menu_driver_populate_entries(info); ui_companion_driver_notify_list_loaded(info->list, info->menu_list); } diff --git a/menu/menu_driver.c b/menu/menu_driver.c index 7fb250f8d6..e461ec158d 100644 --- a/menu/menu_driver.c +++ b/menu/menu_driver.c @@ -510,6 +510,14 @@ void menu_driver_navigation_set(bool scroll) menu_driver_ctx->navigation_set(menu_userdata, scroll); } +void menu_driver_populate_entries(menu_displaylist_info_t *info) +{ + if (menu_driver_ctx->populate_entries) + menu_driver_ctx->populate_entries( + menu_userdata, info->path, + info->label, info->type); +} + bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data) { switch (state) @@ -729,18 +737,6 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data) menu_userdata, pending_push); } break; - case RARCH_MENU_CTL_POPULATE_ENTRIES: - { - menu_displaylist_info_t *info = (menu_displaylist_info_t*)data; - - if (!info) - return false; - if (menu_driver_ctx->populate_entries) - menu_driver_ctx->populate_entries( - menu_userdata, info->path, - info->label, info->type); - } - break; case RARCH_MENU_CTL_LIST_GET_ENTRY: { menu_ctx_list_t *list = (menu_ctx_list_t*)data; diff --git a/menu/menu_driver.h b/menu/menu_driver.h index 9b737bdc2a..fbd9f2ff20 100644 --- a/menu/menu_driver.h +++ b/menu/menu_driver.h @@ -111,7 +111,6 @@ enum rarch_menu_ctl_state RARCH_MENU_CTL_PLAYLIST_GET, RARCH_MENU_CTL_TOGGLE, RARCH_MENU_CTL_CONTEXT_DESTROY, - RARCH_MENU_CTL_POPULATE_ENTRIES, RARCH_MENU_CTL_FIND_DRIVER, RARCH_MENU_CTL_LOAD_IMAGE, RARCH_MENU_CTL_LIST_FREE, @@ -402,6 +401,8 @@ void menu_driver_decrement_navigation(void); void menu_driver_navigation_set(bool scroll); +void menu_driver_populate_entries(menu_displaylist_info_t *info); + bool menu_driver_init(bool video_is_threaded); extern menu_ctx_driver_t menu_ctx_xui;