summaryrefslogtreecommitdiffstats
path: root/apps/alarm_menu.c
diff options
context:
space:
mode:
authorSteve Bavin <pondlife@pondlife.me>2007-10-19 15:31:42 +0000
committerSteve Bavin <pondlife@pondlife.me>2007-10-19 15:31:42 +0000
commit32a95751301a4aa5f51ea76b7eb3764d197dd6e3 (patch)
tree860d5e0c767cc53d038bb72ff19c237215dd3eee /apps/alarm_menu.c
parent877ea486bad40bde6f8b969acc8af50f244884c0 (diff)
downloadrockbox-32a95751301a4aa5f51ea76b7eb3764d197dd6e3.tar.gz
rockbox-32a95751301a4aa5f51ea76b7eb3764d197dd6e3.tar.bz2
rockbox-32a95751301a4aa5f51ea76b7eb3764d197dd6e3.zip
FS#7994 - Rename talk.c API, make talk_disable() affect all talking (not just menus), hopefully save some space.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15206 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/alarm_menu.c')
-rw-r--r--apps/alarm_menu.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/alarm_menu.c b/apps/alarm_menu.c
index 5709c5ad4a..391558a34e 100644
--- a/apps/alarm_menu.c
+++ b/apps/alarm_menu.c
@@ -44,7 +44,7 @@
static void speak_time(int hours, int minutes, bool speak_hours)
{
- if (talk_menus_enabled()){
+ if (global_settings.talk_menu){
if(speak_hours) {
talk_value(hours, UNIT_HOUR, false);
talk_value(minutes, UNIT_MIN, true);
@@ -86,7 +86,7 @@ bool alarm_screen(void)
screens[i].puts(0, 3, str(LANG_ALARM_MOD_KEYS));
}
/* Talk when entering the wakeup screen */
- if (talk_menus_enabled())
+ if (global_settings.talk_menu)
{
talk_value(h, UNIT_HOUR, true);
talk_value(m, UNIT_MIN, true);
@@ -113,7 +113,7 @@ bool alarm_screen(void)
rtc_init();
rtc_set_alarm(h,m);
rtc_enable_alarm(true);
- if (talk_menus_enabled())
+ if (global_settings.talk_menu)
{
talk_id(LANG_ALARM_MOD_TIME_TO_GO, true);
talk_value(togo / 60, UNIT_HOUR, true);
@@ -164,7 +164,7 @@ bool alarm_screen(void)
case ACTION_STD_NEXTREPEAT:
h = (h+1) % 24;
- if (talk_menus_enabled())
+ if (global_settings.talk_menu)
talk_value(h, UNIT_HOUR, false);
break;
@@ -173,7 +173,7 @@ bool alarm_screen(void)
case ACTION_STD_PREVREPEAT:
h = (h+23) % 24;
- if (talk_menus_enabled())
+ if (global_settings.talk_menu)
talk_value(h, UNIT_HOUR, false);
break;