Add 'Core Manager Options'

This commit is contained in:
twinaphex 2015-01-22 04:05:10 +01:00
parent ff570dcdf4
commit 9bb2c00c1c
3 changed files with 49 additions and 24 deletions

View File

@ -22,11 +22,12 @@
static void get_title(const char *label, const char *dir,
unsigned menu_type, char *title, size_t sizeof_title)
{
RARCH_LOG("label %s, title %s\n", label, title);
if (!strcmp(label, "core_list"))
snprintf(title, sizeof_title, "CORE SELECTION %s", dir);
if (!strcmp(label, "core_manager_list"))
else if (!strcmp(label, "core_manager_list"))
snprintf(title, sizeof_title, "CORE MANAGER %s", dir);
if (!strcmp(label, "database_manager_list"))
else if (!strcmp(label, "database_manager_list"))
snprintf(title, sizeof_title, "DATABASE SELECTION %s", dir);
else if (!strcmp(label, "deferred_core_list"))
snprintf(title, sizeof_title, "DETECTED CORES %s", dir);
@ -52,6 +53,8 @@ static void get_title(const char *label, const char *dir,
strlcpy(title, "PLAYLIST OPTIONS", sizeof_title);
else if (!strcmp(label, "Network Options"))
strlcpy(title, "NETWORK OPTIONS", sizeof_title);
else if (!strcmp(label, "Core Manager Options"))
strlcpy(title, "CORE MANAGER OPTIONS", sizeof_title);
else if (!strcmp(label, "User Options"))
strlcpy(title, "USER OPTIONS", sizeof_title);
else if (!strcmp(label, "Path Options"))

View File

@ -5441,7 +5441,7 @@ static bool setting_data_append_list_archive_options(
return true;
}
static bool setting_data_append_list_netplay_options(
static bool setting_data_append_list_core_manager_options(
rarch_setting_t **list,
rarch_setting_info_t *list_info)
{
@ -5449,9 +5449,9 @@ static bool setting_data_append_list_netplay_options(
rarch_setting_group_info_t group_info;
rarch_setting_group_info_t subgroup_info;
START_GROUP(group_info, "Network Options");
START_GROUP(group_info, "Core Manager Options");
START_SUB_GROUP(list, list_info, "Buildbot", group_info.name, subgroup_info);
START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info);
CONFIG_STRING(
g_settings.network.buildbot_url,
@ -5465,6 +5465,21 @@ static bool setting_data_append_list_netplay_options(
settings_data_list_current_add_flags(list, list_info, SD_FLAG_ALLOW_INPUT);
END_SUB_GROUP(list, list_info);
END_GROUP(list, list_info);
#endif
return true;
}
static bool setting_data_append_list_netplay_options(
rarch_setting_t **list,
rarch_setting_info_t *list_info)
{
#ifdef HAVE_NETPLAY
rarch_setting_group_info_t group_info;
rarch_setting_group_info_t subgroup_info;
START_GROUP(group_info, "Network Options");
START_SUB_GROUP(list, list_info, "Netplay", group_info.name, subgroup_info);
@ -6222,6 +6237,12 @@ rarch_setting_t *setting_data_new(unsigned mask)
goto error;
}
if (mask & SL_FLAG_CORE_MANAGER_OPTIONS)
{
if (!setting_data_append_list_core_manager_options(&list, list_info))
goto error;
}
if (mask & SL_FLAG_NETPLAY_OPTIONS)
{
if (!setting_data_append_list_netplay_options(&list, list_info))

View File

@ -61,25 +61,26 @@ enum setting_flags
enum setting_list_flags
{
SL_FLAG_MAIN_MENU = (1 << 0),
SL_FLAG_DRIVER_OPTIONS = (1 << 1),
SL_FLAG_GENERAL_OPTIONS = (1 << 2),
SL_FLAG_VIDEO_OPTIONS = (1 << 3),
SL_FLAG_SHADER_OPTIONS = (1 << 4),
SL_FLAG_FONT_OPTIONS = (1 << 5),
SL_FLAG_AUDIO_OPTIONS = (1 << 6),
SL_FLAG_INPUT_OPTIONS = (1 << 7),
SL_FLAG_OVERLAY_OPTIONS = (1 << 8),
SL_FLAG_MENU_OPTIONS = (1 << 9),
SL_FLAG_UI_OPTIONS = (1 << 10),
SL_FLAG_NETPLAY_OPTIONS = (1 << 11),
SL_FLAG_USER_OPTIONS = (1 << 12),
SL_FLAG_PATH_OPTIONS = (1 << 13),
SL_FLAG_PRIVACY_OPTIONS = (1 << 14),
SL_FLAG_PLAYLIST_OPTIONS = (1 << 15),
SL_FLAG_ARCHIVE_OPTIONS = (1 << 16),
SL_FLAG_PATCH_OPTIONS = (1 << 17),
SL_FLAG_ALL = (1 << 18),
SL_FLAG_MAIN_MENU = (1 << 0),
SL_FLAG_DRIVER_OPTIONS = (1 << 1),
SL_FLAG_GENERAL_OPTIONS = (1 << 2),
SL_FLAG_VIDEO_OPTIONS = (1 << 3),
SL_FLAG_SHADER_OPTIONS = (1 << 4),
SL_FLAG_FONT_OPTIONS = (1 << 5),
SL_FLAG_AUDIO_OPTIONS = (1 << 6),
SL_FLAG_INPUT_OPTIONS = (1 << 7),
SL_FLAG_OVERLAY_OPTIONS = (1 << 8),
SL_FLAG_MENU_OPTIONS = (1 << 9),
SL_FLAG_UI_OPTIONS = (1 << 10),
SL_FLAG_CORE_MANAGER_OPTIONS = (1 << 11),
SL_FLAG_NETPLAY_OPTIONS = (1 << 12),
SL_FLAG_USER_OPTIONS = (1 << 13),
SL_FLAG_PATH_OPTIONS = (1 << 14),
SL_FLAG_PRIVACY_OPTIONS = (1 << 15),
SL_FLAG_PLAYLIST_OPTIONS = (1 << 16),
SL_FLAG_ARCHIVE_OPTIONS = (1 << 17),
SL_FLAG_PATCH_OPTIONS = (1 << 18),
SL_FLAG_ALL = (1 << 19),
};
#define SL_FLAG_ALL_SETTINGS (SL_FLAG_ALL - SL_FLAG_MAIN_MENU)