mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-20 06:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change settings_data_ namespace to settings_

Browse Source
This commit is contained in:
twinaphex 2015-03-21 00:56:26 +01:00
parent 14ac2d9791
commit 73e3460675
11 changed files with 285 additions and 285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apple/OSX/settings.m
View File

@ -283,7 +283,7 @@ NSWindowDelegate>
return BOXINT(*setting->value.boolean);
default:
{
setting_data_get_string_representation(setting, buffer, sizeof(buffer));
setting_get_string_representation(setting, buffer, sizeof(buffer));
if (buffer[0] == '\0')
strlcpy(buffer, "N/A", sizeof(buffer));
return BOXSTRING(buffer);
@ -376,7 +376,7 @@ NSWindowDelegate>
rarch_setting_t *setting = (rarch_setting_t*)&setting_data[[item intValue]];
NSString *editor_string = (NSString*)editor.string;
setting_data_set_with_string_representation(setting, editor_string.UTF8String);
setting_set_with_string_representation(setting, editor_string.UTF8String);
}
}

14
apple/iOS/menu.m
View File

@ -279,7 +279,7 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
if (self.setting->short_description)
result.textLabel.text = BOXSTRING(self.setting->short_description);
setting_data_get_string_representation(self.setting, buffer, sizeof(buffer));
setting_get_string_representation(self.setting, buffer, sizeof(buffer));
if (buffer[0] == '\0')
strlcpy(buffer, "<default>", sizeof(buffer));
@ -308,7 +308,7 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
field.delegate = self.formatter;
setting_data_get_string_representation(self.setting, buffer, sizeof(buffer));
setting_get_string_representation(self.setting, buffer, sizeof(buffer));
if (buffer[0] == '\0')
strlcpy(buffer, "N/A", sizeof(buffer));
@ -326,7 +326,7 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
if (!text.length)
return;
setting_data_set_with_string_representation(self.setting, [text UTF8String]);
setting_set_with_string_representation(self.setting, [text UTF8String]);
[self.parentTable reloadData];
}
@ -353,7 +353,7 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
^(UIActionSheet* actionSheet, NSInteger buttonIndex)
{
if (buttonIndex != actionSheet.cancelButtonIndex)
setting_data_reset_setting(self.setting);
setting_reset_setting(self.setting);
[weakSelf.parentTable reloadData];
});
@ -458,7 +458,7 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
return;
}
setting_data_set_with_string_representation(weakSelf.setting, newval);
setting_set_with_string_representation(weakSelf.setting, newval);
[[list navigationController] popViewControllerAnimated:YES];
weakSelf.action();
@ -494,7 +494,7 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
if (buttonIndex == actionSheet.cancelButtonIndex)
return;
setting_data_set_with_string_representation(self.setting, [[actionSheet buttonTitleAtIndex:buttonIndex] UTF8String]);
setting_set_with_string_representation(self.setting, [[actionSheet buttonTitleAtIndex:buttonIndex] UTF8String]);
[weakSelf.parentTable reloadData];
});
string_list_free(items);
@ -653,7 +653,7 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
menu_list_get_at_offset(menu->menu_list->selection_buf, i, &path,
&entry_label, &type);
setting =
(rarch_setting_t*)setting_data_find_setting
(rarch_setting_t*)setting_find_setting
(menu->list_settings,
menu->menu_list->selection_buf->list[i].label);

12
apple/iOS/platform.m
View File

@ -65,9 +65,9 @@ const void* apple_get_frontend_settings(void)
{
const char *GROUP_NAME = "Frontend Settings";
const char *SUBGROUP_NAME = "Frontend";
settings[0] = setting_data_group_setting(ST_GROUP, "Frontend Settings");
settings[1] = setting_data_group_setting(ST_SUB_GROUP, "Frontend");
settings[2] = setting_data_string_setting(ST_STRING, "ios_btmode", "Bluetooth Input Type", apple_frontend_settings.bluetooth_mode,
settings[0] = setting_group_setting(ST_GROUP, "Frontend Settings");
settings[1] = setting_group_setting(ST_SUB_GROUP, "Frontend");
settings[2] = setting_string_setting(ST_STRING, "ios_btmode", "Bluetooth Input Type", apple_frontend_settings.bluetooth_mode,
sizeof(apple_frontend_settings.bluetooth_mode), "none", "<null>", GROUP_NAME, SUBGROUP_NAME, NULL, NULL);
// Set ios_btmode options based on runtime environment
@ -76,11 +76,11 @@ const void* apple_get_frontend_settings(void)
else
settings[2].values = "icade|keyboard|small_keyboard";
settings[3] = setting_data_string_setting(ST_STRING, "ios_orientations", "Screen Orientations", apple_frontend_settings.orientations,
settings[3] = setting_string_setting(ST_STRING, "ios_orientations", "Screen Orientations", apple_frontend_settings.orientations,
sizeof(apple_frontend_settings.orientations), "both", "<null>", GROUP_NAME, SUBGROUP_NAME, NULL, NULL);
settings[3].values = "both|landscape|portrait";
settings[4] = setting_data_group_setting(ST_END_SUB_GROUP, 0);
settings[5] = setting_data_group_setting(ST_END_GROUP, 0);
settings[4] = setting_group_setting(ST_END_SUB_GROUP, 0);
settings[5] = setting_group_setting(ST_END_GROUP, 0);
}
return settings;

4
menu/menu_entries.c
View File

@ -91,7 +91,7 @@ int menu_entries_push_list(menu_handle_t *menu,
settings_t *settings = config_get_ptr();
settings_list_free(menu->list_settings);
menu->list_settings = (rarch_setting_t *)setting_data_new(setting_flags);
menu->list_settings = (rarch_setting_t *)setting_new(setting_flags);
if (!(setting = (rarch_setting_t*)menu_setting_find(label)))
return -1;
@ -517,7 +517,7 @@ bool menu_entries_init(menu_handle_t *menu)
if (!menu)
return false;
menu->list_settings = setting_data_new(SL_FLAG_ALL);
menu->list_settings = setting_new(SL_FLAG_ALL);
menu_list_push_stack(menu->menu_list, "", "Main Menu", MENU_SETTINGS, 0);
menu_navigation_clear(&menu->navigation, true);

4
menu/menu_entries_cbs_deferred_push.c
View File

@ -1014,7 +1014,7 @@ static int deferred_push_settings(void *data, void *userdata,
return -1;
settings_list_free(menu->list_settings);
menu->list_settings = (rarch_setting_t *)setting_data_new(SL_FLAG_ALL_SETTINGS);
menu->list_settings = (rarch_setting_t *)setting_new(SL_FLAG_ALL_SETTINGS);
setting = menu_setting_find("Driver Settings");
@ -1099,7 +1099,7 @@ static int deferred_push_settings_subgroup(void *data, void *userdata,
}
settings_list_free(menu->list_settings);
menu->list_settings = (rarch_setting_t *)setting_data_new(SL_FLAG_ALL_SETTINGS);
menu->list_settings = (rarch_setting_t *)setting_new(SL_FLAG_ALL_SETTINGS);
setting = menu_setting_find(elem0);

8
menu/menu_entries_cbs_iterate.c
View File

@ -180,7 +180,7 @@ static int mouse_post_iterate(menu_file_list_cbs_t *cbs, const char *path,
{
driver_t *driver = driver_get_ptr();
rarch_setting_t *setting =
(rarch_setting_t*)setting_data_find_setting
(rarch_setting_t*)setting_find_setting
(driver->menu->list_settings,
driver->menu->menu_list->selection_buf->list[menu->navigation.selection_ptr].label);
menu->mouse.oldleft = true;
@ -315,13 +315,13 @@ static int action_iterate_info(const char *label, unsigned action)
if (driver->video_data && driver->menu_ctx && driver->menu_ctx->render)
driver->menu_ctx->render();
current_setting = (rarch_setting_t*)setting_data_find_setting(
current_setting = (rarch_setting_t*)setting_find_setting(
menu->list_settings,
list->list[menu->navigation.selection_ptr].label);
if (current_setting)
strlcpy(needle, current_setting->name, sizeof(needle));
else if ((current_setting = (rarch_setting_t*)setting_data_find_setting(
else if ((current_setting = (rarch_setting_t*)setting_find_setting(
menu->list_settings,
list->list[menu->navigation.selection_ptr].label)))
{
@ -339,7 +339,7 @@ static int action_iterate_info(const char *label, unsigned action)
strlcpy(needle, lbl, sizeof(needle));
}
setting_data_get_description(needle, msg, sizeof(msg));
setting_get_description(needle, msg, sizeof(msg));
if (driver->video_data && driver->menu_ctx &&
driver->menu_ctx->render_messagebox)

2
menu/menu_entries_cbs_representation.c
View File

@ -755,7 +755,7 @@ static void menu_action_setting_disp_set_label(file_list_t* list,
type - MENU_SETTINGS_CORE_OPTION_START),
type_str_size);
else
setting_data_get_label(list, type_str,
setting_get_label(list, type_str,
type_str_size, w, type, label, entry_label, i);
strlcpy(path_buf, path, path_buf_size);

6
menu/menu_input.c
View File

@ -89,7 +89,7 @@ void menu_input_st_uint_callback(void *userdata, const char *str)
{
rarch_setting_t *current_setting = NULL;
if ((current_setting = (rarch_setting_t*)
setting_data_find_setting(
setting_find_setting(
menu->list_settings, menu->keyboard.label_setting)))
*current_setting->value.unsigned_integer = strtoul(str, NULL, 0);
}
@ -108,7 +108,7 @@ void menu_input_st_hex_callback(void *userdata, const char *str)
{
rarch_setting_t *current_setting = NULL;
if ((current_setting = (rarch_setting_t*)
setting_data_find_setting(
setting_find_setting(
menu->list_settings, menu->keyboard.label_setting)))
if (str[0] == '#')
str++;
@ -131,7 +131,7 @@ void menu_input_st_string_callback(void *userdata, const char *str)
rarch_setting_t *current_setting = NULL;
if ((current_setting = (rarch_setting_t*)
setting_data_find_setting(
setting_find_setting(
menu->list_settings, menu->keyboard.label_setting)))
menu_action_setting_set_current_string(current_setting, str);
else

2
menu/menu_setting.c
View File

@ -134,7 +134,7 @@ static int menu_action_handle_setting(rarch_setting_t *setting,
rarch_setting_t *menu_setting_find(const char *label)
{
driver_t *driver = driver_get_ptr();
return (rarch_setting_t*)setting_data_find_setting(
return (rarch_setting_t*)setting_find_setting(
driver->menu->list_settings, label);
}

442
settings.c
View File

File diff suppressed because it is too large Load Diff

72
settings.h
View File

@ -30,23 +30,23 @@ extern "C" {
#define BINDFOR(s) (*(&(s))->value.keybind)
/**
* setting_data_reset_setting:
* setting_reset_setting:
* @setting : pointer to setting
*
* Reset a setting's value to its defaults.
**/
void setting_data_reset_setting(rarch_setting_t* setting);
void setting_reset_setting(rarch_setting_t* setting);
/**
* setting_data_reset:
* setting_reset:
* @settings : pointer to settings
*
* Reset all settings to their default values.
**/
void setting_data_reset(rarch_setting_t* settings);
void setting_reset(rarch_setting_t* settings);
/**
* setting_data_reset:
* setting_reset:
* @settings : pointer to settings
* @name : name of setting to search for
*
@ -54,33 +54,33 @@ void setting_data_reset(rarch_setting_t* settings);
*
* Returns: pointer to setting if found, NULL otherwise.
**/
rarch_setting_t* setting_data_find_setting(rarch_setting_t* settings,
rarch_setting_t* setting_find_setting(rarch_setting_t* settings,
const char* name);
/**
* setting_data_set_with_string_representation:
* setting_set_with_string_representation:
* @setting : pointer to setting
* @value : value for the setting (string)
*
* Set a settings' value with a string. It is assumed
* that the string has been properly formatted.
**/
void setting_data_set_with_string_representation(
void setting_set_with_string_representation(
rarch_setting_t* setting, const char* value);
/**
* setting_data_get_string_representation:
* setting_get_string_representation:
* @setting : pointer to setting
* @buf : buffer to write contents of string representation to.
* @sizeof_buf : size of the buffer (@buf)
*
* Get a setting value's string representation.
**/
void setting_data_get_string_representation(void *data,
void setting_get_string_representation(void *data,
char* buf, size_t sizeof_buf);
/**
* setting_data_action_setting:
* setting_action_setting:
* @name : name of setting.
* @short_description : short description of setting.
* @group : group that the setting belongs to.
@ -90,13 +90,13 @@ void setting_data_get_string_representation(void *data,
*
* Returns: setting of type ST_ACTION.
**/
rarch_setting_t setting_data_action_setting(const char *name,
rarch_setting_t setting_action_setting(const char *name,
const char *short_description,
const char *group,
const char *subgroup);
/**
* setting_data_group_setting:
* setting_group_setting:
* @type : type of settting.
* @name : name of setting.
*
@ -104,11 +104,11 @@ rarch_setting_t setting_data_action_setting(const char *name,
*
* Returns: setting of type ST_GROUP.
**/
rarch_setting_t setting_data_group_setting(enum setting_type type,
rarch_setting_t setting_group_setting(enum setting_type type,
const char* name);
/**
* setting_data_subgroup_setting:
* setting_subgroup_setting:
* @type : type of settting.
* @name : name of setting.
* @parent_name : group that the subgroup setting belongs to.
@ -117,11 +117,11 @@ rarch_setting_t setting_data_group_setting(enum setting_type type,
*
* Returns: setting of type ST_SUBGROUP.
**/
rarch_setting_t setting_data_subgroup_setting(enum setting_type type,
rarch_setting_t setting_subgroup_setting(enum setting_type type,
const char* name, const char *parent_name);
/**
* setting_data_bool_setting:
* setting_bool_setting:
* @name : name of setting.
* @short_description : Short description of setting.
* @target : Target of bool setting.
@ -137,14 +137,14 @@ rarch_setting_t setting_data_subgroup_setting(enum setting_type type,
*
* Returns: setting of type ST_BOOL.
**/
rarch_setting_t setting_data_bool_setting(const char* name,
rarch_setting_t setting_bool_setting(const char* name,
const char* description, bool* target, bool default_value,
const char *off, const char *on, const char * group,
const char *subgroup, change_handler_t change_handler,
change_handler_t read_handler);
/**
* setting_data_int_setting:
* setting_int_setting:
* @name : name of setting.
* @short_description : Short description of setting.
* @target : Target of signed integer setting.
@ -158,13 +158,13 @@ rarch_setting_t setting_data_bool_setting(const char* name,
*
* Returns: setting of type ST_INT.
**/
rarch_setting_t setting_data_int_setting(const char* name,
rarch_setting_t setting_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);
/**
* setting_data_uint_setting:
* setting_uint_setting:
* @name : name of setting.
* @short_description : Short description of setting.
* @target : Target of unsigned integer setting.
@ -178,14 +178,14 @@ rarch_setting_t setting_data_int_setting(const char* name,
*
* Returns: setting of type ST_UINT.
**/
rarch_setting_t setting_data_uint_setting(const char* name,
rarch_setting_t setting_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);
/**
* setting_data_float_setting:
* setting_float_setting:
* @name : name of setting.
* @short_description : Short description of setting.
* @target : Target of float setting.
@ -200,13 +200,13 @@ rarch_setting_t setting_data_uint_setting(const char* name,
*
* Returns: setting of type ST_FLOAT.
**/
rarch_setting_t setting_data_float_setting(const char* name,
rarch_setting_t setting_float_setting(const char* name,
const char* description, float* target, float default_value,
const char *rounding, const char *group, const char *subgroup,
change_handler_t change_handler, change_handler_t read_handler);
/**
* setting_data_string_setting:
* setting_string_setting:
* @type : type of setting.
* @name : name of setting.
* @short_description : Short description of setting.
@ -223,14 +223,14 @@ rarch_setting_t setting_data_float_setting(const char* name,
*
* Returns: String setting of type @type.
**/
rarch_setting_t setting_data_string_setting(enum setting_type type,
rarch_setting_t setting_string_setting(enum setting_type type,
const char* name, const char* description, char* target,
unsigned size, const char* default_value, const char *empty,
const char *group, const char *subgroup,
change_handler_t change_handler, change_handler_t read_handler);
/**
* setting_data_bind_setting:
* setting_bind_setting:
* @name : name of setting.
* @short_description : Short description of setting.
* @target : Target of bind setting.
@ -244,14 +244,14 @@ rarch_setting_t setting_data_string_setting(enum setting_type type,
*
* Returns: setting of type ST_BIND.
**/
rarch_setting_t setting_data_bind_setting(const char* name,
rarch_setting_t setting_bind_setting(const char* name,
const char* description, struct retro_keybind* target, uint32_t idx,
uint32_t idx_offset,
const struct retro_keybind* default_value, const char *group,
const char *subgroup);
/**
* setting_data_string_setting_options:
* setting_string_setting_options:
* @type : type of settting.
* @name : name of setting.
* @short_description : Short description of setting.
@ -269,14 +269,14 @@ rarch_setting_t setting_data_bind_setting(const char* name,
*
* Returns: string option list setting.
**/
rarch_setting_t setting_data_string_setting_options(enum setting_type type,
rarch_setting_t setting_string_setting_options(enum setting_type type,
const char* name, const char* short_description, char* target,
unsigned size, const char* default_value, const char *empty, const char *values,
const char *group, const char *subgroup, change_handler_t change_handler,
change_handler_t read_handler);
/**
* setting_data_get_description:
* setting_get_description:
* @label : identifier label of setting
* @msg : output message
* @sizeof_msg : size of @msg
@ -287,12 +287,12 @@ rarch_setting_t setting_data_string_setting_options(enum setting_type type,
*
* Returns: 0 (always for now). TODO: make it handle -1 as well.
**/
int setting_data_get_description(const char *label, char *msg,
int setting_get_description(const char *label, char *msg,
size_t msg_sizeof);
#ifdef HAVE_MENU
/**
* setting_data_get_label:
* setting_get_label:
* @list : File list on which to perform the search
* @type_str : String for the type to be represented on-screen as
* a label.
@ -306,13 +306,13 @@ int setting_data_get_description(const char *label, char *msg,
*
* Get associated label of a setting.
**/
void setting_data_get_label(file_list_t *list, char *type_str,
void setting_get_label(file_list_t *list, char *type_str,
size_t type_str_size, unsigned *w, unsigned type,
const char *menu_label, const char *label, unsigned idx);
#endif
/**
* setting_data_new:
* setting_new:
* @mask : Bitmask of settings to include.
*
* Request a list of settings based on @mask.
@ -320,7 +320,7 @@ void setting_data_get_label(file_list_t *list, char *type_str,
* Returns: settings list composed of all requested
* settings on success, otherwise NULL.
**/
rarch_setting_t* setting_data_new(unsigned mask);
rarch_setting_t* setting_new(unsigned mask);
#ifdef __cplusplus
}