summaryrefslogtreecommitdiffstats
path: root/apps/root_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/root_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/root_menu.c')
-rw-r--r--apps/root_menu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/root_menu.c b/apps/root_menu.c
index 1c6c868bfc..5acaabeec6 100644
--- a/apps/root_menu.c
+++ b/apps/root_menu.c
@@ -160,7 +160,7 @@ static int browser(void* param)
/* Display building progress */
static long talked_tick = 0;
- if(talk_menus_enabled() &&
+ if(global_settings.talk_menu &&
(talked_tick == 0
|| TIME_AFTER(current_tick, talked_tick+7*HZ)))
{
@@ -238,7 +238,7 @@ static int wpsscrn(void* param)
(void)param;
if (audio_status())
{
- shutup();
+ talk_shutup();
ret_val = gui_wps_show();
}
else if ( global_status.resume_index != -1 )