diff --git a/frontend/menu/backend/menu_backend.h b/frontend/menu/backend/menu_backend.h index 3bfae53c52..0603066b76 100644 --- a/frontend/menu/backend/menu_backend.h +++ b/frontend/menu/backend/menu_backend.h @@ -20,8 +20,6 @@ typedef struct menu_ctx_driver_backend int (*iterate)(unsigned); void (*list_insert)(void *, const char *, const char *, unsigned, size_t); void (*list_delete)(void *, size_t, size_t); - void (*list_clear)(void *); - void (*list_set_selection)(void *); const char *ident; } menu_ctx_driver_backend_t; diff --git a/frontend/menu/backend/menu_common_backend.c b/frontend/menu/backend/menu_common_backend.c index b161c7c5d2..532a41cac4 100644 --- a/frontend/menu/backend/menu_common_backend.c +++ b/frontend/menu/backend/menu_common_backend.c @@ -789,20 +789,11 @@ static void menu_common_list_delete(void *data, size_t idx, list->list[idx].actiondata = NULL; } -static void menu_common_list_clear(void *data) -{ -} - -static void menu_common_list_set_selection(void *data) -{ -} menu_ctx_driver_backend_t menu_ctx_backend_common = { menu_common_iterate, menu_common_list_insert, menu_common_list_delete, - menu_common_list_clear, - menu_common_list_set_selection, "menu_common", }; diff --git a/frontend/menu/backend/menu_lakka_backend.c b/frontend/menu/backend/menu_lakka_backend.c index 4b6412eb83..547ddf59b2 100644 --- a/frontend/menu/backend/menu_lakka_backend.c +++ b/frontend/menu/backend/menu_lakka_backend.c @@ -528,7 +528,5 @@ menu_ctx_driver_backend_t menu_ctx_backend_lakka = { menu_lakka_iterate, NULL, NULL, - NULL, - NULL, "menu_lakka", }; diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c index 7e0940e20d..f14a302056 100644 --- a/frontend/menu/menu_common.c +++ b/frontend/menu/menu_common.c @@ -501,3 +501,11 @@ unsigned menu_common_type_is(const char *label, unsigned type) return 0; } + +void menu_common_list_clear(void *data) +{ +} + +void menu_common_list_set_selection(void *data) +{ +} diff --git a/frontend/menu/menu_common.h b/frontend/menu/menu_common.h index 3d1931a2d6..3f5acd919f 100644 --- a/frontend/menu/menu_common.h +++ b/frontend/menu/menu_common.h @@ -157,6 +157,10 @@ unsigned menu_common_type_is(const char *label, unsigned type); void apply_deferred_settings(void); +void menu_common_list_clear(void *data); + +void menu_common_list_set_selection(void *data); + #ifdef __cplusplus } #endif diff --git a/frontend/menu/menu_list.c b/frontend/menu/menu_list.c index f89da933b4..613c2f81ad 100644 --- a/frontend/menu/menu_list.c +++ b/frontend/menu/menu_list.c @@ -217,8 +217,7 @@ end: if (driver.menu_ctx->list_set_selection) driver.menu_ctx->list_set_selection(list); - if (driver.menu_ctx->backend->list_set_selection) - driver.menu_ctx->backend->list_set_selection(list); + menu_common_list_set_selection(list); } void menu_list_clear(file_list_t *list) @@ -229,8 +228,7 @@ void menu_list_clear(file_list_t *list) if (driver.menu_ctx->list_clear) driver.menu_ctx->list_clear(list); - if (driver.menu_ctx->backend->list_clear) - driver.menu_ctx->backend->list_clear(list); + menu_common_list_clear(list); end: