Move 'Start Videoprocessor Core' / 'Start Remote RetroPad Core' to

'Load Core'
This commit is contained in:
twinaphex 2016-11-06 00:04:37 +01:00
parent cca2aa7ee9
commit 0c41a8873d
4 changed files with 21 additions and 17 deletions

View File

@ -1741,12 +1741,6 @@ static int mui_list_push(void *data, void *userdata,
entry.enum_idx = MENU_ENUM_LABEL_CONFIGURATIONS_LIST;
menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
entry.enum_idx = MENU_ENUM_LABEL_START_VIDEO_PROCESSOR;
menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
entry.enum_idx = MENU_ENUM_LABEL_START_NET_RETROPAD;
menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
entry.enum_idx = MENU_ENUM_LABEL_HELP_LIST;
menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
#if !defined(IOS)

View File

@ -3599,12 +3599,6 @@ static int xmb_list_push(void *data, void *userdata,
entry.enum_idx = MENU_ENUM_LABEL_CONFIGURATIONS_LIST;
menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
entry.enum_idx = MENU_ENUM_LABEL_START_VIDEO_PROCESSOR;
menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
entry.enum_idx = MENU_ENUM_LABEL_START_NET_RETROPAD;
menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
entry.enum_idx = MENU_ENUM_LABEL_HELP_LIST;
menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
#if !defined(IOS)

View File

@ -3346,6 +3346,7 @@ static int menu_displaylist_parse_cores(
filter_ext ? info->exts : NULL,
true, settings->show_hidden_files, true, false);
{
char out_dir[PATH_MAX_LENGTH];
@ -3520,6 +3521,8 @@ static int menu_displaylist_parse_cores(
info->need_sort = true;
}
info->push_builtin_cores = true;
return 0;
}
@ -3852,6 +3855,21 @@ static bool menu_displaylist_push_list_process(menu_displaylist_info_t *info)
if (info->need_sort)
file_list_sort_on_alt(info->list);
if (info->push_builtin_cores)
{
menu_entries_prepend(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_START_VIDEO_PROCESSOR),
msg_hash_to_str(MENU_ENUM_LABEL_START_VIDEO_PROCESSOR),
MENU_ENUM_LABEL_START_VIDEO_PROCESSOR,
MENU_SETTING_ACTION, 0, 0);
menu_entries_prepend(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_START_NET_RETROPAD),
msg_hash_to_str(MENU_ENUM_LABEL_START_NET_RETROPAD),
MENU_ENUM_LABEL_START_NET_RETROPAD,
MENU_SETTING_ACTION, 0, 0);
}
if (info->need_refresh)
menu_entries_ctl(MENU_ENTRIES_CTL_REFRESH, info->list);
@ -4398,11 +4416,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_START_CORE, PARSE_ACTION, false);
menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_START_VIDEO_PROCESSOR, PARSE_ACTION, false);
menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_START_NET_RETROPAD, PARSE_ACTION, false);
#ifndef HAVE_DYNAMIC
if (frontend_driver_has_fork())
@ -6097,6 +6110,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
{
info->need_refresh = true;
info->need_push = true;
}
break;
case DISPLAYLIST_DATABASES:

View File

@ -164,6 +164,7 @@ typedef struct menu_displaylist_info
bool need_entries_refresh;
bool need_push;
bool need_clear;
bool push_builtin_cores;
bool need_navigation_clear;
file_list_t *list;
file_list_t *menu_list;