Move function from menu_action.c to menu_entries_cbs.c and make

static
This commit is contained in:
twinaphex 2014-10-28 20:15:38 +01:00
parent 7248e45f81
commit 2436352af1
3 changed files with 18 additions and 21 deletions

View File

@ -79,24 +79,6 @@ int menu_action_set_current_string_based_on_label(
return 0;
}
int menu_action_setting_set_current_string_path(
rarch_setting_t *setting, const char *dir, const char *path)
{
fill_pathname_join(setting->value.string, dir, path, setting->size);
if (setting->change_handler)
setting->change_handler(setting);
if (setting->flags & SD_FLAG_EXIT
&& setting->cmd_trigger.triggered)
{
setting->cmd_trigger.triggered = false;
return -1;
}
return 0;
}
static int menu_entries_action_ok_set_current_path_selection(
rarch_setting_t *setting, const char *path,
const char *label, unsigned type,

View File

@ -32,9 +32,6 @@ int menu_action_set_current_string_based_on_label(
int menu_action_setting_set_current_string(
rarch_setting_t *setting, const char *str);
int menu_action_setting_set_current_string_path(
rarch_setting_t *setting, const char *dir, const char *path);
int menu_action_setting_set(unsigned type, const char *label,
unsigned action);

View File

@ -459,6 +459,24 @@ static int action_ok_file_load_with_detect_core(const char *path,
return ret;
}
static int menu_action_setting_set_current_string_path(
rarch_setting_t *setting, const char *dir, const char *path)
{
fill_pathname_join(setting->value.string, dir, path, setting->size);
if (setting->change_handler)
setting->change_handler(setting);
if (setting->flags & SD_FLAG_EXIT
&& setting->cmd_trigger.triggered)
{
setting->cmd_trigger.triggered = false;
return -1;
}
return 0;
}
static int action_ok_file_load(const char *path,
const char *label, unsigned type, size_t idx)
{