summaryrefslogtreecommitdiffstats
path: root/apps/alarm_menu.c
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2007-10-04 08:56:49 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2007-10-04 08:56:49 +0000
commitb0a373681bd57e1790032b9fa7ec5a5d6ea8c37d (patch)
treea5952f8182554e2fdfe9e5120c48880f1ce6b54d /apps/alarm_menu.c
parent940e8990b5daf5b78d97331b956b517c6e802cf0 (diff)
downloadrockbox-b0a373681bd57e1790032b9fa7ec5a5d6ea8c37d.tar.gz
rockbox-b0a373681bd57e1790032b9fa7ec5a5d6ea8c37d.tar.bz2
rockbox-b0a373681bd57e1790032b9fa7ec5a5d6ea8c37d.zip
FS#7682 by Daniel Dalton - Enable voice in the wakeup alarm screen
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14977 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/alarm_menu.c')
-rw-r--r--apps/alarm_menu.c50
1 files changed, 44 insertions, 6 deletions
diff --git a/apps/alarm_menu.c b/apps/alarm_menu.c
index 40b817df57..5709c5ad4a 100644
--- a/apps/alarm_menu.c
+++ b/apps/alarm_menu.c
@@ -33,16 +33,27 @@
#include "rtc.h"
#include "misc.h"
#include "screens.h"
-
+#include"talk.h"
#include "lang.h"
#include "power.h"
#include "alarm_menu.h"
#include "backlight.h"
-
#include "splash.h"
#include "statusbar.h"
#include "textarea.h"
+static void speak_time(int hours, int minutes, bool speak_hours)
+{
+ if (talk_menus_enabled()){
+ if(speak_hours) {
+ talk_value(hours, UNIT_HOUR, false);
+ talk_value(minutes, UNIT_MIN, true);
+ } else {
+ talk_value(minutes, UNIT_MIN, false);
+ }
+ }
+}
+
bool alarm_screen(void)
{
int h, m;
@@ -53,7 +64,7 @@ bool alarm_screen(void)
int button;
int i;
bool update = true;
-
+ bool hour_wrapped = false;
rtc_get_alarm(&h, &m);
@@ -74,6 +85,12 @@ bool alarm_screen(void)
gui_textarea_clear(&screens[i]);
screens[i].puts(0, 3, str(LANG_ALARM_MOD_KEYS));
}
+ /* Talk when entering the wakeup screen */
+ if (talk_menus_enabled())
+ {
+ talk_value(h, UNIT_HOUR, true);
+ talk_value(m, UNIT_MIN, true);
+ }
update = false;
}
@@ -91,15 +108,23 @@ bool alarm_screen(void)
/* accept alarms only if they are in 2 minutes or more */
tm = get_time();
togo = (m + h * 60 - tm->tm_min - tm->tm_hour * 60 + 1440) % 1440;
+
if (togo > 1) {
rtc_init();
rtc_set_alarm(h,m);
rtc_enable_alarm(true);
+ if (talk_menus_enabled())
+ {
+ talk_id(LANG_ALARM_MOD_TIME_TO_GO, true);
+ talk_value(togo / 60, UNIT_HOUR, true);
+ talk_value(togo % 60, UNIT_MIN, true);
+ talk_force_enqueue_next();
+ }
gui_syncsplash(HZ*2, str(LANG_ALARM_MOD_TIME_TO_GO),
- togo / 60, togo % 60);
+ togo / 60, togo % 60);
done = true;
} else {
- gui_syncsplash(HZ, str(LANG_ALARM_MOD_ERROR));
+ gui_syncsplash(HZ, ID2P(LANG_ALARM_MOD_ERROR));
update = true;
}
break;
@@ -111,9 +136,12 @@ bool alarm_screen(void)
if (m == 60) {
h += 1;
m = 0;
+ hour_wrapped = true;
}
if (h == 24)
h = 0;
+
+ speak_time(h, m, hour_wrapped);
break;
/* dec(m) */
@@ -123,31 +151,41 @@ bool alarm_screen(void)
if (m == -5) {
h -= 1;
m = 55;
+ hour_wrapped = true;
}
if (h == -1)
h = 23;
+
+ speak_time(h, m, hour_wrapped);
break;
/* inc(h) */
case ACTION_STD_NEXT:
case ACTION_STD_NEXTREPEAT:
h = (h+1) % 24;
+
+ if (talk_menus_enabled())
+ talk_value(h, UNIT_HOUR, false);
break;
/* dec(h) */
case ACTION_STD_PREV:
case ACTION_STD_PREVREPEAT:
h = (h+23) % 24;
+
+ if (talk_menus_enabled())
+ talk_value(h, UNIT_HOUR, false);
break;
case ACTION_STD_CANCEL:
rtc_enable_alarm(false);
- gui_syncsplash(HZ*2, str(LANG_ALARM_MOD_DISABLE));
+ gui_syncsplash(HZ*2, ID2P(LANG_ALARM_MOD_DISABLE));
done = true;
break;
case ACTION_NONE:
gui_syncstatusbar_draw(&statusbars, false);
+ hour_wrapped = false;
break;
default: