CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-30 06:43:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2017-04-28 23:02:22 +02:00
parent f0c2d786ae
commit 957c85f9ea
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configuration.c
View File

@ -160,7 +160,13 @@ struct config_path_setting
GENERAL_SETTING(key, configval, default_enable, default_setting, struct config_path_setting, handle_setting) GENERAL_SETTING(key, configval, default_enable, default_setting, struct config_path_setting, handle_setting)
#define SETTING_ARRAY(key, configval, default_enable, default_setting, handle_setting) \ #define SETTING_ARRAY(key, configval, default_enable, default_setting, handle_setting) \
GENERAL_SETTING(key, configval, default_enable, default_setting, struct config_array_setting, handle_setting) tmp[count].ident = key; \
tmp[count].ptr = configval; \
tmp[count].def_enable = default_enable; \
if (default_enable) \
tmp[count].def = default_setting; \
tmp[count].handle = handle_setting; \
count++
struct defaults g_defaults; struct defaults g_defaults;
static settings_t *configuration_settings = NULL; static settings_t *configuration_settings = NULL;
@ -602,7 +608,7 @@ bool config_overlay_enable_default(void)
static struct config_array_setting *populate_settings_array(settings_t *settings, int *size) static struct config_array_setting *populate_settings_array(settings_t *settings, int *size)
{ {
unsigned count = 0; unsigned count = 0;
struct config_array_setting *tmp = NULL; struct config_array_setting *tmp = (struct config_array_setting*)malloc((*size + 1) * sizeof(struct config_array_setting));
/* Arrays */ /* Arrays */
SETTING_ARRAY("playlist_names", settings->arrays.playlist_names, false, NULL, true); SETTING_ARRAY("playlist_names", settings->arrays.playlist_names, false, NULL, true);
@ -1809,7 +1815,6 @@ static bool config_load_file(const char *path, bool set_defaults,
{ {
unsigned i; unsigned i;
char tmp_str[PATH_MAX_LENGTH]; char tmp_str[PATH_MAX_LENGTH];
int array_settings_size = 0;
int path_settings_size = 0; int path_settings_size = 0;
bool ret = false; bool ret = false;
bool tmp_bool = false; bool tmp_bool = false;
@ -1824,6 +1829,7 @@ static bool config_load_file(const char *path, bool set_defaults,
int float_settings_size = sizeof(settings->floats) / sizeof(settings->floats.placeholder); int float_settings_size = sizeof(settings->floats) / sizeof(settings->floats.placeholder);
int int_settings_size = sizeof(settings->ints) / sizeof(settings->ints.placeholder); int int_settings_size = sizeof(settings->ints) / sizeof(settings->ints.placeholder);
int uint_settings_size = sizeof(settings->uints) / sizeof(settings->uints.placeholder); int uint_settings_size = sizeof(settings->uints) / sizeof(settings->uints.placeholder);
int array_settings_size = sizeof(settings->arrays) / sizeof(settings->arrays.placeholder);
struct config_bool_setting *bool_settings = populate_settings_bool (settings, &bool_settings_size); struct config_bool_setting *bool_settings = populate_settings_bool (settings, &bool_settings_size);
struct config_float_setting *float_settings = populate_settings_float (settings, &float_settings_size); struct config_float_setting *float_settings = populate_settings_float (settings, &float_settings_size);
struct config_int_setting *int_settings = populate_settings_int (settings, &int_settings_size); struct config_int_setting *int_settings = populate_settings_int (settings, &int_settings_size);
@ -3022,7 +3028,6 @@ bool config_save_file(const char *path)
float msg_color; float msg_color;
unsigned i = 0; unsigned i = 0;
bool ret = false; bool ret = false;
int array_settings_size = 0;
int path_settings_size = 0; int path_settings_size = 0;
struct config_bool_setting *bool_settings = NULL; struct config_bool_setting *bool_settings = NULL;
struct config_int_setting *int_settings = NULL; struct config_int_setting *int_settings = NULL;
@ -3036,6 +3041,7 @@ bool config_save_file(const char *path)
int float_settings_size = sizeof(settings->floats)/ sizeof(settings->floats.placeholder); int float_settings_size = sizeof(settings->floats)/ sizeof(settings->floats.placeholder);
int int_settings_size = sizeof(settings->ints) / sizeof(settings->ints.placeholder); int int_settings_size = sizeof(settings->ints) / sizeof(settings->ints.placeholder);
int uint_settings_size = sizeof(settings->uints) / sizeof(settings->uints.placeholder); int uint_settings_size = sizeof(settings->uints) / sizeof(settings->uints.placeholder);
int array_settings_size = sizeof(settings->arrays) / sizeof(settings->arrays.placeholder);
if (!conf) if (!conf)
conf = config_file_new(NULL); conf = config_file_new(NULL);
@ -3302,7 +3308,7 @@ bool config_save_overrides(int override_type)
float_overrides = populate_settings_float(overrides, &tmp_i); float_overrides = populate_settings_float(overrides, &tmp_i);
array_settings = populate_settings_array(settings, &array_settings_size); array_settings = populate_settings_array(settings, &array_settings_size);
tmp_i = 0; tmp_i = sizeof(settings->arrays) / sizeof(settings->arrays.placeholder);
array_overrides = populate_settings_array (overrides, &tmp_i); array_overrides = populate_settings_array (overrides, &tmp_i);
path_settings = populate_settings_path(settings, &path_settings_size); path_settings = populate_settings_path(settings, &path_settings_size);

2
configuration.h
View File

@ -328,6 +328,8 @@ typedef struct settings
struct struct
{ {
char placeholder;
char playlist_names[PATH_MAX_LENGTH]; char playlist_names[PATH_MAX_LENGTH];
char playlist_cores[PATH_MAX_LENGTH]; char playlist_cores[PATH_MAX_LENGTH];
char video_driver[32]; char video_driver[32];