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

Remove CONFIG_GET_HEX_BASE macro

This commit is contained in:
twinaphex 2015-11-21 18:08:37 +01:00
parent f91ba67c5b
commit 5c71cb06d4
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
configuration.c
View File

@ -1154,6 +1154,16 @@ static void config_file_dump_all(config_file_t *conf)
} }
} }
#endif #endif
static void config_get_hex_base(config_file_t *conf, const char *key, unsigned *base)
{
unsigned tmp = 0;
if (!base)
return;
if (config_get_hex(conf, key, &tmp))
*base = tmp;
}
/** /**
* config_load: * config_load:
* @path : path to be read from. * @path : path to be read from.
@ -1264,12 +1274,12 @@ static bool config_load_file(const char *path, bool set_defaults)
"menu_navigation_browser_filter_supported_extensions_enable"); "menu_navigation_browser_filter_supported_extensions_enable");
CONFIG_GET_BOOL_BASE(conf, settings, menu.show_advanced_settings, CONFIG_GET_BOOL_BASE(conf, settings, menu.show_advanced_settings,
"menu_show_advanced_settings"); "menu_show_advanced_settings");
CONFIG_GET_HEX_BASE(conf, settings, menu.entry_normal_color, config_get_hex_base(conf, "menu_entry_normal_color",
"menu_entry_normal_color"); &settings->menu.entry_normal_color);
CONFIG_GET_HEX_BASE(conf, settings, menu.entry_hover_color, config_get_hex_base(conf, "menu_entry_hover_color",
"menu_entry_hover_color"); &settings->menu.entry_hover_color);
CONFIG_GET_HEX_BASE(conf, settings, menu.title_color, config_get_hex_base(conf, "menu_title_color",
"menu_title_color"); &settings->menu.title_color);
config_get_path(conf, "menu_wallpaper", config_get_path(conf, "menu_wallpaper",
settings->menu.wallpaper, sizeof(settings->menu.wallpaper)); settings->menu.wallpaper, sizeof(settings->menu.wallpaper));
if (!strcmp(settings->menu.wallpaper, "default")) if (!strcmp(settings->menu.wallpaper, "default"))

12
libretro-common/include/file/config_file.h
View File

@ -46,18 +46,6 @@ extern "C" {
base->var = tmp; \ base->var = tmp; \
} while(0) } while(0)
#define CONFIG_GET_UINT64_BASE(conf, base, var, key) do { \
uint64_t tmp = 0; \
if (config_get_int(conf, key, &tmp)) \
base->var = tmp; \
} while(0)
#define CONFIG_GET_HEX_BASE(conf, base, var, key) do { \
unsigned tmp = 0; \
if (config_get_hex(conf, key, &tmp)) \
base->var = tmp; \
} while(0)
#define CONFIG_GET_FLOAT_BASE(conf, base, var, key) do { \ #define CONFIG_GET_FLOAT_BASE(conf, base, var, key) do { \
float tmp = 0.0f; \ float tmp = 0.0f; \
if (config_get_float(conf, key, &tmp)) \ if (config_get_float(conf, key, &tmp)) \