len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-08 12:45:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplified 12 hour time voicing.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14425 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2007-08-22 05:16:10 +00:00
parent ec6ca5ae94
commit 94381ebc30
1 changed files with 11 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

34
apps/menus/main_menu.c
View file

@ -211,22 +211,18 @@ static bool show_info(void)
talk_id(VOICE_CURRENT_TIME, true);
if (global_settings.timeformat == 1)
{
/* Voice the time in 12 hour format */
if (tm->tm_hour == 0)
bool pm = false;
int hour = tm->tm_hour;
if (hour >= 12)
{
/* Make it say 12 am instead of 0 am */
talk_value(12, UNIT_INT, true);
}
else if (tm->tm_hour <= 12)
{
/* If between 0 and 12, we voice the hour as-is */
talk_value(tm->tm_hour, UNIT_INT, true);
}
else
{
/* Subtract 12 hours if we're past noon */
talk_value(tm->tm_hour-12, UNIT_INT, true);
pm = true;
hour -= 12;
}
if (hour == 0)
hour = 12;
talk_value(hour, UNIT_INT, true);
/* Voice the minutes */
if (tm->tm_min == 0)
@ -239,15 +235,7 @@ static bool show_info(void)
talk_value(tm->tm_min, UNIT_INT, true);
}
/* Voice the suffix */
if (tm->tm_hour >= 12)
{
talk_id(VOICE_PM, true);
}
else
{
talk_id(VOICE_AM, true);
}
talk_id(pm ? VOICE_PM : VOICE_AM, true);
}
else
{