summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2008-07-08 02:30:58 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2008-07-08 02:30:58 +0000
commit39de8688f9c8f3c535ba9019d36106f12e0cdff2 (patch)
tree98beea9c7c34f48236fcfb2d0c9a673a5e4cf7a9
parentce4e453465e4e21ded7b1887e9a6274e06fb29b1 (diff)
downloadrockbox-39de8688f9c8f3c535ba9019d36106f12e0cdff2.tar.gz
rockbox-39de8688f9c8f3c535ba9019d36106f12e0cdff2.zip
fix FS#9162 - the time needs to not talk so often, not the date line
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17985 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/menus/main_menu.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c
index 614f5a6c34..c77e9a7d16 100644
--- a/apps/menus/main_menu.c
+++ b/apps/menus/main_menu.c
@@ -302,24 +302,13 @@ static int info_speak_item(int selected_item, void * data)
break;
#if CONFIG_RTC
case INFO_TIME:
- tm = get_time();
- talk_id(VOICE_CURRENT_TIME, false);
- if (valid_time(tm))
- {
- talk_time(tm, true);
- }
- else
- {
- talk_id(LANG_UNKNOWN, true);
- }
- break;
- case INFO_DATE:
if (TIME_AFTER(current_tick, last_talk + HZ*60))
{
tm = get_time();
+ talk_id(VOICE_CURRENT_TIME, false);
if (valid_time(tm))
{
- talk_date(get_time(), true);
+ talk_time(tm, true);
}
else
{
@@ -328,6 +317,17 @@ static int info_speak_item(int selected_item, void * data)
last_talk = current_tick;
}
break;
+ case INFO_DATE:
+ tm = get_time();
+ if (valid_time(tm))
+ {
+ talk_date(get_time(), true);
+ }
+ else
+ {
+ talk_id(LANG_UNKNOWN, true);
+ }
+ break;
#endif
case INFO_BUFFER: /* buffer */
{