From 8616f3cdb13f2c571d8065a5598dba443a86d604 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 26 Jul 2014 01:57:50 +0200 Subject: [PATCH] (Settings data) Building helper functions - make them public again --- settings_data.c | 14 +++++++------- settings_data.h | 11 +++++++++++ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/settings_data.c b/settings_data.c index 5c2fe4a4a1..792ff7e349 100644 --- a/settings_data.c +++ b/settings_data.c @@ -253,13 +253,13 @@ const char* setting_data_get_string_representation(const rarch_setting_t* settin return buffer; } -static rarch_setting_t setting_data_group_setting(enum setting_type type, const char* name) +rarch_setting_t setting_data_group_setting(enum setting_type type, const char* name) { rarch_setting_t result = { type, name }; return result; } -static rarch_setting_t setting_data_float_setting(const char* name, const char* description, float* target, float default_value, const char *group, const char *subgroup, change_handler_t change_handler, change_handler_t read_handler) +rarch_setting_t setting_data_float_setting(const char* name, const char* description, float* target, float default_value, const char *group, const char *subgroup, change_handler_t change_handler, change_handler_t read_handler) { rarch_setting_t result = { ST_FLOAT, name, sizeof(float), description, group, subgroup }; result.change_handler = change_handler; @@ -269,7 +269,7 @@ static rarch_setting_t setting_data_float_setting(const char* name, const char* return result; } -static rarch_setting_t setting_data_bool_setting(const char* name, const char* description, bool* target, bool default_value, const char *group, const char *subgroup, change_handler_t change_handler, change_handler_t read_handler) +rarch_setting_t setting_data_bool_setting(const char* name, const char* description, bool* target, bool default_value, const char *group, const char *subgroup, change_handler_t change_handler, change_handler_t read_handler) { rarch_setting_t result = { ST_BOOL, name, sizeof(bool), description, group, subgroup }; result.change_handler = change_handler; @@ -279,7 +279,7 @@ static rarch_setting_t setting_data_bool_setting(const char* name, const char* d return result; } -static rarch_setting_t setting_data_int_setting(const char* name, const char* description, int* target, int default_value, const char *group, const char *subgroup, change_handler_t change_handler, change_handler_t read_handler) +rarch_setting_t setting_data_int_setting(const char* name, const char* description, int* target, int default_value, const char *group, const char *subgroup, change_handler_t change_handler, change_handler_t read_handler) { rarch_setting_t result = { ST_INT, name, sizeof(int), description, group, subgroup }; result.change_handler = change_handler; @@ -289,7 +289,7 @@ static rarch_setting_t setting_data_int_setting(const char* name, const char* de return result; } -static rarch_setting_t setting_data_uint_setting(const char* name, const char* description, unsigned int* target, unsigned int default_value, const char *group, const char *subgroup, change_handler_t change_handler, change_handler_t read_handler) +rarch_setting_t setting_data_uint_setting(const char* name, const char* description, unsigned int* target, unsigned int default_value, const char *group, const char *subgroup, change_handler_t change_handler, change_handler_t read_handler) { rarch_setting_t result = { ST_UINT, name, sizeof(unsigned int), description, group, subgroup }; result.change_handler = change_handler; @@ -299,7 +299,7 @@ static rarch_setting_t setting_data_uint_setting(const char* name, const char* d return result; } -static rarch_setting_t setting_data_string_setting(enum setting_type type, +rarch_setting_t setting_data_string_setting(enum setting_type type, const char* name, const char* description, char* target, unsigned size, const char* default_value, const char *group, const char *subgroup, change_handler_t change_handler, change_handler_t read_handler) @@ -313,7 +313,7 @@ static rarch_setting_t setting_data_string_setting(enum setting_type type, return result; } -static rarch_setting_t setting_data_bind_setting(const char* name, +rarch_setting_t setting_data_bind_setting(const char* name, const char* description, struct retro_keybind* target, uint32_t index, const struct retro_keybind* default_value, const char *group, const char *subgroup) diff --git a/settings_data.h b/settings_data.h index a2897fb277..ce93692beb 100644 --- a/settings_data.h +++ b/settings_data.h @@ -105,6 +105,17 @@ rarch_setting_t* setting_data_find_setting(rarch_setting_t* settings, const char void setting_data_set_with_string_representation(const rarch_setting_t* setting, const char* value); const char* setting_data_get_string_representation(const rarch_setting_t* setting, char* buffer, size_t length); +// List building helper functions +rarch_setting_t setting_data_group_setting(enum setting_type type, const char* name); +rarch_setting_t setting_data_bool_setting(const char* name, const char* description, bool* target, bool default_value, const char * group, const char *subgroup, change_handler_t change_handler, change_handler_t read_handler); +rarch_setting_t setting_data_int_setting(const char* name, const char* description, int* target, int default_value, const char *group, const char *subgroup, change_handler_t change_handler, change_handler_t read_handler); +rarch_setting_t setting_data_uint_setting(const char* name, const char* description, unsigned int* target, unsigned int default_value, const char *group, const char *subgroup, change_handler_t change_handler, change_handler_t read_handler); +rarch_setting_t setting_data_float_setting(const char* name, const char* description, float* target, float default_value, const char *group, const char *subgroup, change_handler_t change_handler, change_handler_t read_handler); +rarch_setting_t setting_data_string_setting(enum setting_type type, const char* name, const char* description, char* target, unsigned size, const char* default_value, const char *group, const char *subgroup, change_handler_t change_handler, change_handler_t read_handler); +rarch_setting_t setting_data_bind_setting(const char* name, const char* description, struct retro_keybind* target, uint32_t index, + const struct retro_keybind* default_value, const char *group, const char *subgroup); + + // These functions operate only on RetroArch's main settings list rarch_setting_t* setting_data_get_list(void);