summaryrefslogtreecommitdiff
path: root/apps/gui/option_select.c
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2017-09-18 06:00:05 -0400
committerMichael Sevakis <jethead71@rockbox.org>2017-11-21 05:01:14 -0500
commitaced667f48c29a160aa4e5c0a8df037092b28189 (patch)
tree66e48e4a27daaf36f01d7ff1ed6876a7de38b0c0 /apps/gui/option_select.c
parent5c9688961ef9166cec5225db50d5f73691d8292d (diff)
downloadrockbox-aced667f48c29a160aa4e5c0a8df037092b28189.tar.gz
rockbox-aced667f48c29a160aa4e5c0a8df037092b28189.zip
Undo hacks to meant to get around string formatting limitations
The new vuprintf makes unnecessary workarounds due to formatting limitations. I checked grep output for whatever appeared to fit but it's possible I missed some instances because they weren't so obvious. Also, this means sound settings can dynamically work with any number of decimals rather than the current assumption of one or two. Add an ipow() function to help and take advantage of dynamic field width and precision. Consolidate string formatting of sound settings. Change-Id: I46caf534859dfd1916cd440cd25e5206b192fcd8
Diffstat (limited to 'apps/gui/option_select.c')
-rw-r--r--apps/gui/option_select.c20
1 files changed, 3 insertions, 17 deletions
diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c
index 0452467994..f99e833a1e 100644
--- a/apps/gui/option_select.c
+++ b/apps/gui/option_select.c
@@ -106,23 +106,9 @@ const char *option_get_valuestring(const struct settings_list *setting,
106 } 106 }
107 else if ((setting->flags & F_T_SOUND) == F_T_SOUND) 107 else if ((setting->flags & F_T_SOUND) == F_T_SOUND)
108 { 108 {
109 char sign = ' '; 109 format_sound_value(buffer, buf_len,
110 const char *unit = sound_unit(setting->sound_setting->setting); 110 setting->sound_setting->setting,
111 int val = sound_val2phys(setting->sound_setting->setting, (int)temp_var); 111 temp_var);
112 if (sound_numdecimals(setting->sound_setting->setting))
113 {
114 int integer, dec;
115 if(val < 0)
116 {
117 sign = '-';
118 val = abs(val);
119 }
120 integer = val / 10;
121 dec = val % 10;
122 snprintf(buffer, buf_len, "%c%d.%d %s", sign, integer, dec, unit);
123 }
124 else
125 snprintf(buffer, buf_len, "%d %s", val, unit);
126 } 112 }
127 else if ((setting->flags & F_CHOICE_SETTING) == F_CHOICE_SETTING) 113 else if ((setting->flags & F_CHOICE_SETTING) == F_CHOICE_SETTING)
128 { 114 {