mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

(menu_cbs_ok.c) More code de-duplication

Browse Source
This commit is contained in:
twinaphex 2015-09-03 22:56:30 +02:00
parent 18226651e0
commit 2d18d6e27d
1 changed files with 38 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
menu/cbs/menu_cbs_ok.c
View File

@ -383,47 +383,6 @@ static int action_ok_shader_pass_load(const char *path,
ACTION_OK_LOAD_SHADER_PASS, MENU_LABEL_SHADER_OPTIONS); ACTION_OK_LOAD_SHADER_PASS, MENU_LABEL_SHADER_OPTIONS);
} }
#ifdef HAVE_SHADER_MANAGER
extern size_t hack_shader_pass;
#endif
static int action_ok_shader_pass(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx)
{
menu_displaylist_info_t info = {0};
menu_handle_t *menu = menu_driver_get_ptr();
menu_list_t *menu_list = menu_list_get_ptr();
settings_t *settings = config_get_ptr();
hack_shader_pass = type - MENU_SETTINGS_SHADER_PASS_0;
if (!menu || !menu_list)
return -1;
info.list = menu_list->menu_stack;
info.type = type;
info.directory_ptr = idx;
strlcpy(info.path, settings->video.shader_dir, sizeof(info.path));
strlcpy(info.label, label, sizeof(info.label));
return menu_displaylist_push_list(&info, DISPLAYLIST_GENERIC);
}
static int action_ok_shader_parameters(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx)
{
menu_displaylist_info_t info = {0};
menu_handle_t *menu = menu_driver_get_ptr();
menu_list_t *menu_list = menu_list_get_ptr();
if (!menu || !menu_list)
return -1;
info.list = menu_list->menu_stack;
info.type = MENU_SETTING_ACTION;
info.directory_ptr = idx;
strlcpy(info.label, label, sizeof(info.label));
return menu_displaylist_push_list(&info, DISPLAYLIST_GENERIC);
}
int action_ok_push_generic_list(const char *path, int action_ok_push_generic_list(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx) const char *label, unsigned type, size_t idx, size_t entry_idx)
@ -1677,8 +1636,10 @@ enum
ACTION_OK_DL_OPEN_ARCHIVE, ACTION_OK_DL_OPEN_ARCHIVE,
ACTION_OK_DL_OPEN_ARCHIVE_DETECT_CORE, ACTION_OK_DL_OPEN_ARCHIVE_DETECT_CORE,
ACTION_OK_DL_HELP, ACTION_OK_DL_HELP,
ACTION_OK_RPL_ENTRY, ACTION_OK_DL_RPL_ENTRY,
ACTION_OK_AUDIO_DSP_PLUGIN ACTION_OK_DL_AUDIO_DSP_PLUGIN,
ACTION_OK_DL_SHADER_PASS,
ACTION_OK_DL_SHADER_PARAMETERS
}; };
@ -1730,7 +1691,7 @@ static int generic_action_ok_displaylist_push(const char *path,
menu->push_help_screen = true; menu->push_help_screen = true;
dl_type = DISPLAYLIST_HELP; dl_type = DISPLAYLIST_HELP;
break; break;
case ACTION_OK_RPL_ENTRY: case ACTION_OK_DL_RPL_ENTRY:
strlcpy(menu->deferred_path, label, sizeof(menu->deferred_path)); strlcpy(menu->deferred_path, label, sizeof(menu->deferred_path));
strlcpy(info.label, strlcpy(info.label,
menu_hash_to_str(MENU_LABEL_DEFERRED_RPL_ENTRY_ACTIONS), sizeof(info.label)); menu_hash_to_str(MENU_LABEL_DEFERRED_RPL_ENTRY_ACTIONS), sizeof(info.label));
@ -1738,13 +1699,24 @@ static int generic_action_ok_displaylist_push(const char *path,
info.directory_ptr = idx; info.directory_ptr = idx;
rpl_entry_selection_ptr = idx; rpl_entry_selection_ptr = idx;
break; break;
case ACTION_OK_AUDIO_DSP_PLUGIN: case ACTION_OK_DL_AUDIO_DSP_PLUGIN:
info.type = 0; info.type = 0;
info.directory_ptr = idx; info.directory_ptr = idx;
strlcpy(info.path, settings->audio.filter_dir, sizeof(info.path)); strlcpy(info.path, settings->audio.filter_dir, sizeof(info.path));
strlcpy(info.label, strlcpy(info.label,
menu_hash_to_str(MENU_LABEL_AUDIO_DSP_PLUGIN), sizeof(info.label)); menu_hash_to_str(MENU_LABEL_AUDIO_DSP_PLUGIN), sizeof(info.label));
break; break;
case ACTION_OK_DL_SHADER_PASS:
info.type = type;
info.directory_ptr = idx;
strlcpy(info.path, settings->video.shader_dir, sizeof(info.path));
strlcpy(info.label, label, sizeof(info.label));
break;
case ACTION_OK_DL_SHADER_PARAMETERS:
info.type = MENU_SETTING_ACTION;
info.directory_ptr = idx;
strlcpy(info.label, label, sizeof(info.label));
break;
} }
info.list = menu_list->menu_stack; info.list = menu_list->menu_stack;
@ -1752,18 +1724,37 @@ static int generic_action_ok_displaylist_push(const char *path,
return menu_displaylist_push_list(&info, dl_type); return menu_displaylist_push_list(&info, dl_type);
} }
#ifdef HAVE_SHADER_MANAGER
extern size_t hack_shader_pass;
#endif
static int action_ok_shader_pass(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx)
{
hack_shader_pass = type - MENU_SETTINGS_SHADER_PASS_0;
return generic_action_ok_displaylist_push(path, label, type, idx,
entry_idx, ACTION_OK_DL_SHADER_PASS);
}
static int action_ok_shader_parameters(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx)
{
return generic_action_ok_displaylist_push(path, label, type, idx,
entry_idx, ACTION_OK_DL_SHADER_PARAMETERS);
}
static int action_ok_audio_dsp_plugin(const char *path, static int action_ok_audio_dsp_plugin(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx) const char *label, unsigned type, size_t idx, size_t entry_idx)
{ {
return generic_action_ok_displaylist_push(path, label, type, idx, return generic_action_ok_displaylist_push(path, label, type, idx,
entry_idx, ACTION_OK_AUDIO_DSP_PLUGIN); entry_idx, ACTION_OK_DL_AUDIO_DSP_PLUGIN);
} }
static int action_ok_rpl_entry(const char *path, static int action_ok_rpl_entry(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx) const char *label, unsigned type, size_t idx, size_t entry_idx)
{ {
return generic_action_ok_displaylist_push(path, label, type, idx, return generic_action_ok_displaylist_push(path, label, type, idx,
entry_idx, ACTION_OK_RPL_ENTRY); entry_idx, ACTION_OK_DL_RPL_ENTRY);
} }
static int generic_action_ok_help(const char *path, static int generic_action_ok_help(const char *path,