summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2010-05-12 05:23:02 +0000
committerMichael Sevakis <jethead71@rockbox.org>2010-05-12 05:23:02 +0000
commit1de56ac367c332a675af430a7023f7c0e4d81d06 (patch)
treef53a78968149f8b33fa02f2115c60529c663714c
parent418c9eeb141ac751a59572fde1fcbc1e4655f064 (diff)
downloadrockbox-1de56ac367c332a675af430a7023f7c0e4d81d06.tar.gz
rockbox-1de56ac367c332a675af430a7023f7c0e4d81d06.zip
Have option_get_valuestring always call sound_val2phys before formatting rather than only if fractional places are specified.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25960 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/gui/option_select.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c
index feed1dc2db..a1e41f10e8 100644
--- a/apps/gui/option_select.c
+++ b/apps/gui/option_select.c
@@ -113,11 +113,10 @@ const char *option_get_valuestring(const struct settings_list *setting,
113 { 113 {
114 char sign = ' '; 114 char sign = ' ';
115 const char *unit = sound_unit(setting->sound_setting->setting); 115 const char *unit = sound_unit(setting->sound_setting->setting);
116 int val = sound_val2phys(setting->sound_setting->setting, (int)temp_var);
116 if (sound_numdecimals(setting->sound_setting->setting)) 117 if (sound_numdecimals(setting->sound_setting->setting))
117 { 118 {
118 int integer, dec; 119 int integer, dec;
119 int val = sound_val2phys(setting->sound_setting->setting,
120 (int)temp_var);
121 if(val < 0) 120 if(val < 0)
122 { 121 {
123 sign = '-'; 122 sign = '-';
@@ -128,7 +127,7 @@ const char *option_get_valuestring(const struct settings_list *setting,
128 snprintf(buffer, buf_len, "%c%d.%d %s", sign, integer, dec, unit); 127 snprintf(buffer, buf_len, "%c%d.%d %s", sign, integer, dec, unit);
129 } 128 }
130 else 129 else
131 snprintf(buffer, buf_len, "%d %s", (int)temp_var, unit); 130 snprintf(buffer, buf_len, "%d %s", val, unit);
132 } 131 }
133 else if ((setting->flags & F_CHOICE_SETTING) == F_CHOICE_SETTING) 132 else if ((setting->flags & F_CHOICE_SETTING) == F_CHOICE_SETTING)
134 { 133 {