CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-26 21:36:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(Menu) Refactor more code to menu_action.c

Browse Source
This commit is contained in:
twinaphex 2014-09-15 07:52:08 +02:00
parent 35cc778bb3
commit 756356870b
4 changed files with 47 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
frontend/menu/backend/menu_common_backend.c
View File

@ -238,37 +238,6 @@ static int menu_common_setting_set_current_path_selection(
return menu_action_setting_apply(setting);
}
static int menu_common_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);
return menu_action_setting_apply(setting);
}
int menu_common_set_current_string_based_on_label(
const char *label, const char *str)
{
if (!strcmp(label, "video_shader_preset_save_as"))
{
#ifdef HAVE_SHADER_MANAGER
if (driver.menu_ctx && driver.menu_ctx->backend
&& driver.menu_ctx->backend->shader_manager_save_preset)
driver.menu_ctx->backend->shader_manager_save_preset(str, false);
#endif
}
return 0;
}
int menu_common_setting_set_current_string(
rarch_setting_t *setting, const char *str)
{
strlcpy(setting->value.string, str, setting->size);
return menu_action_setting_apply(setting);
}
static int handle_setting(rarch_setting_t *setting,
unsigned id, const char *label, unsigned action)
{
@ -1237,7 +1206,7 @@ static int menu_action_ok(const char *menu_path,
}
else if ((setting && setting->type == ST_PATH))
{
menu_common_setting_set_current_string_path(setting, menu_path, path);
menu_action_setting_set_current_string_path(setting, menu_path, path);
menu_entries_pop_stack(driver.menu->menu_stack, setting->name);
}
else if (!strcmp(menu_label, "disk_image_append"))
@ -1296,7 +1265,7 @@ static int menu_action_ok(const char *menu_path,
case MENU_FILE_AUDIOFILTER:
case MENU_FILE_VIDEOFILTER:
menu_common_setting_set_current_string_path(setting, menu_path, path);
menu_action_setting_set_current_string_path(setting, menu_path, path);
menu_entries_pop_stack(driver.menu->menu_stack, setting->name);
return 0;
@ -1370,7 +1339,7 @@ static int menu_action_ok(const char *menu_path,
if (setting && setting->type == ST_DIR)
{
menu_common_setting_set_current_string(setting, menu_path);
menu_action_setting_set_current_string(setting, menu_path);
menu_entries_pop_stack(driver.menu->menu_stack, setting->name);
}

31
frontend/menu/menu_action.c
View File

@ -246,3 +246,34 @@ void menu_action_setting_driver(
}
}
}
int menu_action_setting_set_current_string(
rarch_setting_t *setting, const char *str)
{
strlcpy(setting->value.string, str, setting->size);
return menu_action_setting_apply(setting);
}
int menu_action_set_current_string_based_on_label(
const char *label, const char *str)
{
if (!strcmp(label, "video_shader_preset_save_as"))
{
#ifdef HAVE_SHADER_MANAGER
if (driver.menu_ctx && driver.menu_ctx->backend
&& driver.menu_ctx->backend->shader_manager_save_preset)
driver.menu_ctx->backend->shader_manager_save_preset(str, false);
#endif
}
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);
return menu_action_setting_apply(setting);
}

9
frontend/menu/menu_action.h
View File

@ -33,4 +33,13 @@ int menu_action_setting_unsigned_integer(
void menu_action_setting_driver(
rarch_setting_t *setting, unsigned action);
int menu_action_set_current_string_based_on_label(
const char *label, const char *str);
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);
#endif

12
frontend/menu/menu_input_line_cb.c
View File

@ -25,16 +25,11 @@
#include <limits.h>
#include <ctype.h>
#include "menu_common.h"
#include "menu_action.h"
#include "../../input/keyboard_line.h"
#include "menu_input_line_cb.h"
#include "../../settings_data.h"
/* forward decls */
int menu_common_setting_set_current_string(rarch_setting_t *setting,
const char *str);
int menu_common_set_current_string_based_on_label(
const char *label, const char *str);
void menu_key_start_line(void *data, const char *label,
const char *label_setting, input_keyboard_line_complete_t cb)
{
@ -100,9 +95,10 @@ void st_string_callback(void *userdata, const char *str)
if ((current_setting = (rarch_setting_t*)
setting_data_find_setting(
setting_data, menu->keyboard.label_setting)))
menu_common_setting_set_current_string(current_setting, str);
menu_action_setting_set_current_string(current_setting, str);
else
menu_common_set_current_string_based_on_label(menu->keyboard.label_setting, str);
menu_action_set_current_string_based_on_label(
menu->keyboard.label_setting, str);
}
menu_key_end_line(menu);
}