(Menu) Rename more xmb_ variables

This commit is contained in:
twinaphex 2016-05-01 04:46:16 +02:00
parent 6d720ff337
commit 729b1bf64b
6 changed files with 12 additions and 11 deletions

View File

@ -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;

View File

@ -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",

View File

@ -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];

View File

@ -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");

View File

@ -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];

View File

@ -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,