From 1f5276ee62dbbcf04e5c0036b36e6250c6e1c1f9 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 15 Oct 2014 20:47:43 +0200 Subject: [PATCH] Start getting rid of menu_parse_check --- frontend/menu/menu_entries.c | 2 -- frontend/menu/menu_entries_cbs.c | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/frontend/menu/menu_entries.c b/frontend/menu/menu_entries.c index 92cc2d80d9..eb90ed40a0 100644 --- a/frontend/menu/menu_entries.c +++ b/frontend/menu/menu_entries.c @@ -739,8 +739,6 @@ static int menu_parse_check(const char *label, unsigned menu_type) !strcmp(label, "Main Menu") || !strcmp(label, "settings") || !strcmp(label, "performance_counters") || - !strcmp(label, "core_information") || - !strcmp(label, "deferred_core_list") || !strcmp(label, "core_counters") || !strcmp(label, "frontend_counters") || !strcmp(label, "core_options") || diff --git a/frontend/menu/menu_entries_cbs.c b/frontend/menu/menu_entries_cbs.c index d7e6dcec87..d12837f168 100644 --- a/frontend/menu/menu_entries_cbs.c +++ b/frontend/menu/menu_entries_cbs.c @@ -1324,6 +1324,20 @@ static int deferred_push_core_list_deferred(void *data, void *userdata, return 0; } +static int deferred_push_core_information(void *data, void *userdata, + const char *path, const char *label, unsigned type) +{ + file_list_t *list = (file_list_t*)data; + file_list_t *menu_list = (file_list_t*)userdata; + + if (!list || !menu_list) + return -1; + + return push_list(driver.menu, list, path, label, type); + + return 0; +} + static int deferred_push_core_list(void *data, void *userdata, const char *path, const char *label, unsigned type) { @@ -1774,6 +1788,8 @@ static void menu_entries_cbs_init_bind_deferred_push(menu_file_list_cbs_t *cbs, if (!strcmp(label, "deferred_core_list")) cbs->action_deferred_push = deferred_push_core_list_deferred; + else if (!strcmp(label, "core_information")) + cbs->action_deferred_push = deferred_push_core_information; else if (!strcmp(label, "core_list")) cbs->action_deferred_push = deferred_push_core_list; else if (!strcmp(label, "history_list"))