From 729b1bf64ba46599ba32bf348781bc7a5cd6d621 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 1 May 2016 04:46:16 +0200 Subject: [PATCH] (Menu) Rename more xmb_ variables --- config.def.h | 7 ++++--- configuration.c | 6 +++--- configuration.h | 2 +- menu/cbs/menu_cbs_get_value.c | 2 +- menu/drivers/xmb.c | 2 +- menu/menu_setting.c | 4 ++-- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/config.def.h b/config.def.h index 00995cc75a..7a4bf13379 100644 --- a/config.def.h +++ b/config.def.h @@ -511,9 +511,10 @@ static bool default_block_config_read = true; static unsigned xmb_scale_factor = 100; static unsigned xmb_alpha_factor = 75; -static unsigned xmb_theme = 0; -static unsigned xmb_gradient = 0; -static bool xmb_shadows_enable = false; +static unsigned xmb_theme = 0; +static bool xmb_shadows_enable = false; + +static unsigned menu_background_gradient = 4; #if defined(HAVE_OPENGLES2) static unsigned menu_shader_pipeline = 1; diff --git a/configuration.c b/configuration.c index c1d9188c94..4a013258d3 100644 --- a/configuration.c +++ b/configuration.c @@ -485,7 +485,7 @@ static void config_set_defaults(void) settings->menu.xmb_scale_factor = xmb_scale_factor; settings->menu.xmb_alpha_factor = xmb_alpha_factor; settings->menu.xmb_theme = xmb_theme; - settings->menu.xmb_gradient = xmb_gradient; + settings->menu.background_gradient= menu_background_gradient; settings->menu.xmb_shadows_enable = xmb_shadows_enable; settings->menu.shader_pipeline = menu_shader_pipeline; settings->menu.xmb_font[0] = '\0'; @@ -1549,7 +1549,7 @@ static bool config_load_file(const char *path, bool set_defaults) CONFIG_GET_INT_BASE(conf, settings, menu.xmb_scale_factor, "xmb_scale_factor"); CONFIG_GET_INT_BASE(conf, settings, menu.xmb_alpha_factor, "xmb_alpha_factor"); CONFIG_GET_INT_BASE(conf, settings, menu.xmb_theme, "xmb_theme"); - CONFIG_GET_INT_BASE(conf, settings, menu.xmb_gradient, "xmb_gradient"); + CONFIG_GET_INT_BASE(conf, settings, menu.background_gradient, "menu_background_gradient"); CONFIG_GET_BOOL_BASE(conf, settings, menu.xmb_shadows_enable, "xmb_shadows_enable"); CONFIG_GET_INT_BASE(conf, settings, menu.shader_pipeline, "menu_shader_pipeline"); config_get_path(conf, "xmb_font", settings->menu.xmb_font, sizeof(settings->menu.xmb_font)); @@ -2817,7 +2817,7 @@ bool config_save_file(const char *path) config_set_int(conf, "xmb_scale_factor", settings->menu.xmb_scale_factor); config_set_int(conf, "xmb_alpha_factor", settings->menu.xmb_alpha_factor); config_set_int(conf, "xmb_theme", settings->menu.xmb_theme); - config_set_int(conf, "xmb_gradient", settings->menu.xmb_gradient); + config_set_int(conf, "menu_background_gradient", settings->menu.background_gradient); config_set_bool(conf, "xmb_shadows_enable", settings->menu.xmb_shadows_enable); config_set_int(conf, "menu_shader_pipeline", settings->menu.shader_pipeline); config_set_path(conf, "xmb_font", diff --git a/configuration.h b/configuration.h index 84274e2a2f..f651384222 100644 --- a/configuration.h +++ b/configuration.h @@ -161,7 +161,7 @@ typedef struct settings unsigned xmb_scale_factor; unsigned xmb_alpha_factor; unsigned xmb_theme; - unsigned xmb_gradient; + unsigned background_gradient; bool xmb_shadows_enable; unsigned shader_pipeline; char xmb_font[PATH_MAX_LENGTH]; diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c index 6d0a66442a..9669054084 100644 --- a/menu/cbs/menu_cbs_get_value.c +++ b/menu/cbs/menu_cbs_get_value.c @@ -666,7 +666,7 @@ static void menu_action_setting_disp_set_label_xmb_gradient( strlcpy(s2, path, len2); *w = 19; - switch (settings->menu.xmb_gradient) + switch (settings->menu.background_gradient) { case 0: snprintf(s, len, "%s", "Legacy Red"); diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index fad8c74efd..65377e2ba6 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -338,7 +338,7 @@ static float *xmb_gradient_ident(void) { settings_t *settings = config_get_ptr(); - switch (settings->menu.xmb_gradient) + switch (settings->menu.background_gradient) { case 1: return &gradient_dark_purple[0]; diff --git a/menu/menu_setting.c b/menu/menu_setting.c index ee7e0ab8b7..4a6245c138 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -5983,10 +5983,10 @@ static bool setting_append_list( CONFIG_UINT( list, list_info, - &settings->menu.xmb_gradient, + &settings->menu.background_gradient, menu_hash_to_str(MENU_LABEL_XMB_GRADIENT), menu_hash_to_str(MENU_LABEL_VALUE_XMB_GRADIENT), - xmb_gradient, + menu_background_gradient, &group_info, &subgroup_info, parent_group,