ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(menu_setting.c) Stop using settings->arrays.menu_driver to 

identify the menu driver
This commit is contained in:
twinaphex 2020-03-05 16:27:35 +01:00
parent 5f8020b32e
commit e75e2ede92
1 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
menu/menu_setting.c
View File

@ -7455,6 +7455,7 @@ static bool setting_append_list(
rarch_setting_group_info_t group_info = {0}; rarch_setting_group_info_t group_info = {0};
rarch_setting_group_info_t subgroup_info = {0}; rarch_setting_group_info_t subgroup_info = {0};
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
const char *menu_ident = menu_driver_ident();
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
(void)settings; (void)settings;
@ -7620,7 +7621,7 @@ static bool setting_append_list(
} }
#endif #endif
if (string_is_not_equal(settings->arrays.menu_driver, "xmb") && string_is_not_equal(settings->arrays.menu_driver, "ozone")) if (string_is_not_equal(menu_ident, "xmb") && string_is_not_equal(menu_ident, "ozone"))
{ {
CONFIG_ACTION( CONFIG_ACTION(
list, list_info, list, list_info,
@ -12399,8 +12400,8 @@ static bool setting_append_list(
START_SUB_GROUP(list, list_info, "State", &group_info, &subgroup_info, parent_group); START_SUB_GROUP(list, list_info, "State", &group_info, &subgroup_info, parent_group);
if (string_is_not_equal(settings->arrays.menu_driver, "rgui") && if (string_is_not_equal(menu_ident, "rgui") &&
string_is_not_equal(settings->arrays.menu_driver, "ozone")) string_is_not_equal(menu_ident, "ozone"))
{ {
CONFIG_PATH( CONFIG_PATH(
list, list_info, list, list_info,
@ -12433,7 +12434,7 @@ static bool setting_append_list(
SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_LAKKA_ADVANCED); SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_LAKKA_ADVANCED);
} }
if (string_is_not_equal(settings->arrays.menu_driver, "rgui")) if (string_is_not_equal(menu_ident, "rgui"))
{ {
CONFIG_FLOAT( CONFIG_FLOAT(
list, list_info, list, list_info,
@ -12452,7 +12453,7 @@ static bool setting_append_list(
SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_LAKKA_ADVANCED); SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_LAKKA_ADVANCED);
} }
if (string_is_equal(settings->arrays.menu_driver, "xmb")) if (string_is_equal(menu_ident, "xmb"))
{ {
CONFIG_BOOL( CONFIG_BOOL(
list, list_info, list, list_info,
@ -12554,7 +12555,7 @@ static bool setting_append_list(
SD_FLAG_ADVANCED SD_FLAG_ADVANCED
); );
if (string_is_equal(settings->arrays.menu_driver, "rgui")) if (string_is_equal(menu_ident, "rgui"))
{ {
CONFIG_BOOL( CONFIG_BOOL(
list, list_info, list, list_info,
@ -12787,7 +12788,7 @@ static bool setting_append_list(
SD_FLAG_NONE); SD_FLAG_NONE);
} }
if (string_is_equal(settings->arrays.menu_driver, "xmb")) if (string_is_equal(menu_ident, "xmb"))
{ {
CONFIG_BOOL( CONFIG_BOOL(
list, list_info, list, list_info,
@ -12969,7 +12970,7 @@ static bool setting_append_list(
SD_FLAG_NONE); SD_FLAG_NONE);
#endif #endif
if (string_is_equal(settings->arrays.menu_driver, "xmb") || string_is_equal(settings->arrays.menu_driver, "ozone")) if (string_is_equal(menu_ident, "xmb") || string_is_equal(menu_ident, "ozone"))
{ {
CONFIG_BOOL( CONFIG_BOOL(
list, list_info, list, list_info,
@ -13028,9 +13029,9 @@ static bool setting_append_list(
START_SUB_GROUP(list, list_info, "Display", &group_info, &subgroup_info, parent_group); START_SUB_GROUP(list, list_info, "Display", &group_info, &subgroup_info, parent_group);
/* > MaterialUI, XMB and Ozone all support menu scaling */ /* > MaterialUI, XMB and Ozone all support menu scaling */
if (string_is_equal(settings->arrays.menu_driver, "glui") || if (string_is_equal(menu_ident, "glui") ||
string_is_equal(settings->arrays.menu_driver, "xmb") || string_is_equal(menu_ident, "xmb") ||
string_is_equal(settings->arrays.menu_driver, "ozone")) string_is_equal(menu_ident, "ozone"))
{ {
CONFIG_FLOAT( CONFIG_FLOAT(
list, list_info, list, list_info,
@ -13049,7 +13050,7 @@ static bool setting_append_list(
} }
#ifdef HAVE_XMB #ifdef HAVE_XMB
if (string_is_equal(settings->arrays.menu_driver, "xmb")) if (string_is_equal(menu_ident, "xmb"))
{ {
/* only XMB uses these values, don't show /* only XMB uses these values, don't show
* them on other drivers. */ * them on other drivers. */
@ -13221,7 +13222,7 @@ static bool setting_append_list(
(*list)[list_info->index - 1].ui_type = ST_UI_TYPE_UINT_COMBOBOX; (*list)[list_info->index - 1].ui_type = ST_UI_TYPE_UINT_COMBOBOX;
} }
#endif #endif
if (string_is_equal(settings->arrays.menu_driver, "ozone")) if (string_is_equal(menu_ident, "ozone"))
{ {
CONFIG_BOOL( CONFIG_BOOL(
list, list_info, list, list_info,
@ -13491,7 +13492,7 @@ static bool setting_append_list(
#endif #endif
#if defined(HAVE_XMB) || defined(HAVE_OZONE) #if defined(HAVE_XMB) || defined(HAVE_OZONE)
if (string_is_equal(settings->arrays.menu_driver, "xmb") || string_is_equal(settings->arrays.menu_driver, "ozone")) if (string_is_equal(menu_ident, "xmb") || string_is_equal(menu_ident, "ozone"))
{ {
CONFIG_BOOL( CONFIG_BOOL(
list, list_info, list, list_info,
@ -13654,7 +13655,7 @@ static bool setting_append_list(
SD_FLAG_NONE); SD_FLAG_NONE);
#ifdef HAVE_MATERIALUI #ifdef HAVE_MATERIALUI
if (string_is_equal(settings->arrays.menu_driver, "glui")) if (string_is_equal(menu_ident, "glui"))
{ {
/* only MaterialUI uses these values, don't show /* only MaterialUI uses these values, don't show
* them on other drivers. */ * them on other drivers. */
@ -13859,7 +13860,7 @@ static bool setting_append_list(
#endif #endif
#ifdef HAVE_OZONE #ifdef HAVE_OZONE
if (string_is_equal(settings->arrays.menu_driver, "ozone")) if (string_is_equal(menu_ident, "ozone"))
{ {
CONFIG_UINT( CONFIG_UINT(
list, list_info, list, list_info,
@ -13925,7 +13926,7 @@ static bool setting_append_list(
general_read_handler, general_read_handler,
SD_FLAG_ADVANCED); SD_FLAG_ADVANCED);
if (string_is_equal(settings->arrays.menu_driver, "rgui")) if (string_is_equal(menu_ident, "rgui"))
{ {
CONFIG_BOOL( CONFIG_BOOL(
list, list_info, list, list_info,
@ -13958,25 +13959,25 @@ static bool setting_append_list(
SD_FLAG_NONE); SD_FLAG_NONE);
} }
if (string_is_equal(settings->arrays.menu_driver, "xmb") || if (string_is_equal(menu_ident, "xmb") ||
string_is_equal(settings->arrays.menu_driver, "ozone") || string_is_equal(menu_ident, "ozone") ||
string_is_equal(settings->arrays.menu_driver, "rgui") || string_is_equal(menu_ident, "rgui") ||
string_is_equal(settings->arrays.menu_driver, "glui")) string_is_equal(menu_ident, "glui"))
{ {
enum msg_hash_enums thumbnails_label_value; enum msg_hash_enums thumbnails_label_value;
enum msg_hash_enums left_thumbnails_label_value; enum msg_hash_enums left_thumbnails_label_value;
if (string_is_equal(settings->arrays.menu_driver, "rgui")) if (string_is_equal(menu_ident, "rgui"))
{ {
thumbnails_label_value = MENU_ENUM_LABEL_VALUE_THUMBNAILS_RGUI; thumbnails_label_value = MENU_ENUM_LABEL_VALUE_THUMBNAILS_RGUI;
left_thumbnails_label_value = MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_RGUI; left_thumbnails_label_value = MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_RGUI;
} }
else if (string_is_equal(settings->arrays.menu_driver, "ozone")) else if (string_is_equal(menu_ident, "ozone"))
{ {
thumbnails_label_value = MENU_ENUM_LABEL_VALUE_THUMBNAILS; thumbnails_label_value = MENU_ENUM_LABEL_VALUE_THUMBNAILS;
left_thumbnails_label_value = MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE; left_thumbnails_label_value = MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE;
} }
else if (string_is_equal(settings->arrays.menu_driver, "glui")) else if (string_is_equal(menu_ident, "glui"))
{ {
thumbnails_label_value = MENU_ENUM_LABEL_VALUE_THUMBNAILS_MATERIALUI; thumbnails_label_value = MENU_ENUM_LABEL_VALUE_THUMBNAILS_MATERIALUI;
left_thumbnails_label_value = MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_MATERIALUI; left_thumbnails_label_value = MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_MATERIALUI;
@ -14022,7 +14023,7 @@ static bool setting_append_list(
(*list)[list_info->index - 1].ui_type = ST_UI_TYPE_UINT_RADIO_BUTTONS; (*list)[list_info->index - 1].ui_type = ST_UI_TYPE_UINT_RADIO_BUTTONS;
} }
if (string_is_equal(settings->arrays.menu_driver, "xmb")) if (string_is_equal(menu_ident, "xmb"))
{ {
CONFIG_BOOL( CONFIG_BOOL(
list, list_info, list, list_info,
@ -14055,9 +14056,9 @@ static bool setting_append_list(
menu_settings_list_current_add_range(list, list_info, (*list)[list_info->index - 1].offset_by, 100, 1, true, true); menu_settings_list_current_add_range(list, list_info, (*list)[list_info->index - 1].offset_by, 100, 1, true, true);
} }
if (string_is_equal(settings->arrays.menu_driver, "xmb") || if (string_is_equal(menu_ident, "xmb") ||
string_is_equal(settings->arrays.menu_driver, "ozone") || string_is_equal(menu_ident, "ozone") ||
string_is_equal(settings->arrays.menu_driver, "glui")) string_is_equal(menu_ident, "glui"))
{ {
CONFIG_UINT( CONFIG_UINT(
list, list_info, list, list_info,
@ -14074,7 +14075,7 @@ static bool setting_append_list(
menu_settings_list_current_add_range(list, list_info, 0, 1024, 256, true, true); menu_settings_list_current_add_range(list, list_info, 0, 1024, 256, true, true);
} }
if (string_is_equal(settings->arrays.menu_driver, "rgui")) if (string_is_equal(menu_ident, "rgui"))
{ {
CONFIG_UINT( CONFIG_UINT(
list, list_info, list, list_info,
@ -15508,7 +15509,7 @@ static bool setting_append_list(
); );
#ifdef HAVE_OZONE #ifdef HAVE_OZONE
if (string_is_equal(settings->arrays.menu_driver, "ozone")) if (string_is_equal(menu_ident, "ozone"))
{ {
CONFIG_BOOL( CONFIG_BOOL(
list, list_info, list, list_info,
@ -15606,7 +15607,7 @@ static bool setting_append_list(
SD_FLAG_NONE SD_FLAG_NONE
); );
if (string_is_equal(settings->arrays.menu_driver, "xmb") || string_is_equal(settings->arrays.menu_driver, "ozone")) if (string_is_equal(menu_ident, "xmb") || string_is_equal(menu_ident, "ozone"))
CONFIG_BOOL( CONFIG_BOOL(
list, list_info, list, list_info,
&settings->bools.cheevos_badges_enable, &settings->bools.cheevos_badges_enable,