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

Bind UINT settings

This commit is contained in:
twinaphex 2015-01-30 10:35:06 +01:00
parent b1df7d3944
commit 356e026efb
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
menu/menu_action.c
View File

@ -122,9 +122,7 @@ rarch_setting_t *menu_action_find_setting(const char *label)
void menu_action_setting_get_representation(rarch_setting_t *setting, char *type_str, size_t type_str_size) void menu_action_setting_get_representation(rarch_setting_t *setting, char *type_str, size_t type_str_size)
{ {
if (!setting) if (setting)
return;
setting_data_get_string_representation(setting, type_str, type_str_size); setting_data_get_string_representation(setting, type_str, type_str_size);
} }

16
settings_data.c
View File

@ -253,9 +253,10 @@ static void menu_common_setting_set_label_st_float(rarch_setting_t *setting,
* *
* Get a setting value's string representation. * Get a setting value's string representation.
**/ **/
void setting_data_get_string_representation(rarch_setting_t* setting, void setting_data_get_string_representation(void *data,
char* buf, size_t sizeof_buf) char* buf, size_t sizeof_buf)
{ {
rarch_setting_t* setting = (rarch_setting_t*)data;
if (!setting || !buf || !sizeof_buf) if (!setting || !buf || !sizeof_buf)
return; return;
@ -267,9 +268,6 @@ void setting_data_get_string_representation(rarch_setting_t* setting,
case ST_INT: case ST_INT:
snprintf(buf, sizeof_buf, "%d", *setting->value.integer); snprintf(buf, sizeof_buf, "%d", *setting->value.integer);
break; break;
case ST_UINT:
menu_common_setting_set_label_st_uint(setting, buf, sizeof_buf);
break;
case ST_FLOAT: case ST_FLOAT:
menu_common_setting_set_label_st_float(setting, buf, sizeof_buf); menu_common_setting_set_label_st_float(setting, buf, sizeof_buf);
break; break;
@ -296,6 +294,7 @@ void setting_data_get_string_representation(rarch_setting_t* setting,
input_get_bind_string(buf, keybind, auto_bind, sizeof_buf); input_get_bind_string(buf, keybind, auto_bind, sizeof_buf);
} }
break; break;
case ST_UINT:
case ST_ACTION: case ST_ACTION:
if (setting->get_string_representation) if (setting->get_string_representation)
setting->get_string_representation(setting, buf, sizeof_buf); setting->get_string_representation(setting, buf, sizeof_buf);
@ -1150,6 +1149,13 @@ static void menu_common_setting_set_label_st_bool(rarch_setting_t *setting,
setting->boolean.off_label, type_str_size); setting->boolean.off_label, type_str_size);
} }
static void setting_data_get_string_representation_uint(void *data,
char *type_str, size_t type_str_size)
{
rarch_setting_t *setting = (rarch_setting_t*)data;
menu_common_setting_set_label_st_uint(setting, type_str, type_str_size);
}
/** /**
* menu_common_setting_set_label_st_uint: * menu_common_setting_set_label_st_uint:
* @setting : pointer to setting * @setting : pointer to setting
@ -1621,6 +1627,7 @@ rarch_setting_t setting_data_uint_setting(const char* name,
result.action_toggle = setting_data_uint_action_toggle_default; result.action_toggle = setting_data_uint_action_toggle_default;
result.action_ok = setting_data_uint_action_ok_default; result.action_ok = setting_data_uint_action_ok_default;
result.action_cancel = NULL; result.action_cancel = NULL;
result.get_string_representation = &setting_data_get_string_representation_uint;
return result; return result;
} }
@ -2789,6 +2796,7 @@ static void get_string_representation_bind_device(void * data, char *type_str,
strlcpy(type_str, "Disabled", type_str_size); strlcpy(type_str, "Disabled", type_str_size);
} }
static void get_string_representation_savestate(void * data, char *type_str, static void get_string_representation_savestate(void * data, char *type_str,
size_t type_str_size) size_t type_str_size)
{ {

2
settings_data.h
View File

@ -75,7 +75,7 @@ void setting_data_set_with_string_representation(
* *
* Get a setting value's string representation. * Get a setting value's string representation.
**/ **/
void setting_data_get_string_representation(rarch_setting_t* setting, void setting_data_get_string_representation(void *data,
char* buf, size_t sizeof_buf); char* buf, size_t sizeof_buf);
/** /**