diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index e262d23feb..24a487f6ce 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -2303,6 +2303,15 @@ static int menu_displaylist_parse_generic(menu_displaylist_info_t *info, bool *n return 0; } +static void menu_driver_populate_entries(const char *path, + const char *label, unsigned k) +{ + const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr(); + + if (driver->populate_entries) + driver->populate_entries(path, label, k); +} + int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type) { size_t i, list_size; diff --git a/menu/menu_driver.c b/menu/menu_driver.c index aa957ad1b1..bb982b312a 100644 --- a/menu/menu_driver.c +++ b/menu/menu_driver.c @@ -262,29 +262,6 @@ size_t menu_driver_list_get_selection(void) return 0; } -void menu_driver_list_insert(file_list_t *list, const char *path, - const char *label, unsigned type, size_t idx) -{ - menu_file_list_cbs_t *cbs = NULL; - const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr(); - - if (!list) - return; - - if (driver->list_insert) - driver->list_insert(list, path, label, idx); - - file_list_free_actiondata(list, idx); - cbs = (menu_file_list_cbs_t*) - calloc(1, sizeof(menu_file_list_cbs_t)); - - if (!cbs) - return; - - file_list_set_actiondata(list, idx, cbs); - menu_cbs_init(list, path, label, type, idx); -} - void menu_driver_list_cache(menu_list_type_t type, unsigned action) { const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr(); @@ -368,15 +345,6 @@ void menu_driver_toggle(bool latch) driver->toggle(latch); } -void menu_driver_populate_entries(const char *path, const char *label, - unsigned k) -{ - const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr(); - - if (driver->populate_entries) - driver->populate_entries(path, label, k); -} - bool menu_driver_load_image(void *data, menu_image_type_t type) { const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr(); diff --git a/menu/menu_driver.h b/menu/menu_driver.h index 5fa726013f..1f47c07580 100644 --- a/menu/menu_driver.h +++ b/menu/menu_driver.h @@ -195,18 +195,12 @@ void menu_driver_free(menu_handle_t *menu); void menu_driver_toggle(bool latch); -void menu_driver_populate_entries(const char *path, const char *label, - unsigned k); - bool menu_driver_load_image(void *data, menu_image_type_t type); void menu_driver_list_cache(menu_list_type_t type, unsigned action); void menu_driver_list_free(file_list_t *list, size_t i, size_t list_size); -void menu_driver_list_insert(file_list_t *list, const char *path, - const char *label, unsigned type, size_t list_size); - void menu_driver_list_clear(file_list_t *list); size_t menu_driver_list_get_size(menu_list_type_t type); diff --git a/menu/menu_list.c b/menu/menu_list.c index 5e02a4866a..1e7293043a 100644 --- a/menu/menu_list.c +++ b/menu/menu_list.c @@ -24,6 +24,29 @@ #include "menu_list.h" #include "menu_navigation.h" +static void menu_driver_list_insert(file_list_t *list, const char *path, + const char *label, unsigned type, size_t idx) +{ + menu_file_list_cbs_t *cbs = NULL; + const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr(); + + if (!list) + return; + + if (driver->list_insert) + driver->list_insert(list, path, label, idx); + + file_list_free_actiondata(list, idx); + cbs = (menu_file_list_cbs_t*) + calloc(1, sizeof(menu_file_list_cbs_t)); + + if (!cbs) + return; + + file_list_set_actiondata(list, idx, cbs); + menu_cbs_init(list, path, label, type, idx); +} + menu_list_t *menu_list_get_ptr(void) { menu_entries_t *entries = menu_entries_get_ptr();