From aa4cc4f4a2c589ad6fc4ab1b3d2ffb8a945bfd3b Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 15 Oct 2014 01:14:35 +0200 Subject: [PATCH] Move menu_entries_set_current_path_selection to menu_entries.c and make it static --- frontend/menu/menu_action.c | 22 ++++++++++++++++++++++ frontend/menu/menu_entries.c | 24 ------------------------ frontend/menu/menu_entries.h | 5 ----- 3 files changed, 22 insertions(+), 29 deletions(-) diff --git a/frontend/menu/menu_action.c b/frontend/menu/menu_action.c index ce1d489c4e..326c77fe41 100644 --- a/frontend/menu/menu_action.c +++ b/frontend/menu/menu_action.c @@ -121,6 +121,28 @@ int menu_action_setting_set_current_string_path( return menu_action_setting_apply(setting); } +static int menu_entries_set_current_path_selection( + rarch_setting_t *setting, const char *start_path, + const char *label, unsigned type, + unsigned action) +{ + switch (action) + { + case MENU_ACTION_OK: + menu_entries_push(driver.menu->menu_stack, + start_path, label, type, + driver.menu->selection_ptr); + + if (setting->cmd_trigger.idx != RARCH_CMD_NONE) + setting->cmd_trigger.triggered = true; + break; + case MENU_ACTION_START: + *setting->value.string = '\0'; + break; + } + + return menu_action_setting_apply(setting); +} static int menu_action_handle_setting(rarch_setting_t *setting, unsigned type, const char *label, unsigned action) diff --git a/frontend/menu/menu_entries.c b/frontend/menu/menu_entries.c index 3063407806..a252101dd0 100644 --- a/frontend/menu/menu_entries.c +++ b/frontend/menu/menu_entries.c @@ -925,30 +925,6 @@ void menu_flush_stack_label(file_list_t *list, } } - -int menu_entries_set_current_path_selection( - rarch_setting_t *setting, const char *start_path, - const char *label, unsigned type, - unsigned action) -{ - switch (action) - { - case MENU_ACTION_OK: - menu_entries_push(driver.menu->menu_stack, - start_path, label, type, - driver.menu->selection_ptr); - - if (setting->cmd_trigger.idx != RARCH_CMD_NONE) - setting->cmd_trigger.triggered = true; - break; - case MENU_ACTION_START: - *setting->value.string = '\0'; - break; - } - - return menu_action_setting_apply(setting); -} - bool menu_entries_init(menu_handle_t *menu) { if (!menu) diff --git a/frontend/menu/menu_entries.h b/frontend/menu/menu_entries.h index 2c63c16fdc..cfb2f6f366 100644 --- a/frontend/menu/menu_entries.h +++ b/frontend/menu/menu_entries.h @@ -39,11 +39,6 @@ void menu_entries_pop_stack(file_list_t *list, const char *needle); void menu_flush_stack_type(file_list_t *list, unsigned final_type); void menu_flush_stack_label(file_list_t *list, const char *needle); -int menu_entries_set_current_path_selection( - rarch_setting_t *setting, const char *start_path, - const char *label, unsigned type, - unsigned action); - bool menu_entries_init(menu_handle_t *menu); #ifdef __cplusplus