summaryrefslogtreecommitdiff
path: root/apps/menus/main_menu.c
diff options
context:
space:
mode:
authorBertrik Sikken <bertrik@sikken.nl>2008-08-03 22:02:11 +0000
committerBertrik Sikken <bertrik@sikken.nl>2008-08-03 22:02:11 +0000
commitd86255b4a976b48a7ad4ceeb3df5eb3ecb0ce60a (patch)
treee95b64132dbe2e594ede6506addbefcfaefad694 /apps/menus/main_menu.c
parent038eb36643d01a966f847a660308c8de96fece42 (diff)
downloadrockbox-d86255b4a976b48a7ad4ceeb3df5eb3ecb0ce60a.zip
rockbox-d86255b4a976b48a7ad4ceeb3df5eb3ecb0ce60a.tar.gz
rockbox-d86255b4a976b48a7ad4ceeb3df5eb3ecb0ce60a.tar.bz2
rockbox-d86255b4a976b48a7ad4ceeb3df5eb3ecb0ce60a.tar.xz
Fix FS#9237 (Mismatch in voiced and displayed buffer size).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18190 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menus/main_menu.c')
-rw-r--r--apps/menus/main_menu.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c
index c77e9a7..2f3b63f 100644
--- a/apps/menus/main_menu.c
+++ b/apps/menus/main_menu.c
@@ -220,11 +220,9 @@ static char* info_getname(int selected_item, void *data,
#endif
case INFO_BUFFER: /* buffer */
{
- long buflen = ((audiobufend - audiobuf) * 2) / 2097; /* avoid overflow */
- int integer = buflen / 1000;
- int decimal = buflen % 1000;
- snprintf(buffer, buffer_len, (char *)str(LANG_BUFFER_STAT),
- integer, decimal);
+ long kib = (audiobufend - audiobuf) / 1024; /* to KiB */
+ output_dyn_value(s1, sizeof(s1), kib, kbyte_units, true);
+ snprintf(buffer, buffer_len, "%s %s", str(LANG_BUFFER_STAT), s1);
}
break;
case INFO_BATTERY: /* battery */
@@ -332,8 +330,8 @@ static int info_speak_item(int selected_item, void * data)
case INFO_BUFFER: /* buffer */
{
talk_id(LANG_BUFFER_STAT, false);
- long buflen = ((audiobufend - audiobuf) * 2) / 2097; /* avoid overflow */
- output_dyn_value(NULL, 0, buflen, kbyte_units, true);
+ long kib = (audiobufend - audiobuf) / 1024; /* to KiB */
+ output_dyn_value(NULL, 0, kib, kbyte_units, true);
break;
}
case INFO_BATTERY: /* battery */