From 3e31d509553efc5155c7b0b878fa1f24f8975bf0 Mon Sep 17 00:00:00 2001 From: Stéphane Doyon Date: Wed, 10 Oct 2007 03:12:17 +0000 Subject: Export shutup() function from talk.c. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15061 a1c6a512-1295-4272-9138-f99709370657 --- apps/talk.c | 4 ++-- apps/talk.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/talk.c b/apps/talk.c index afbbe5cf10..47410121ba 100644 --- a/apps/talk.c +++ b/apps/talk.c @@ -140,7 +140,7 @@ static void mp3_callback(unsigned char** start, size_t* size); static int queue_clip(unsigned char* buf, long size, bool enqueue); static int open_voicefile(void); static unsigned char* get_clip(long id, long* p_size); -static int shutup(void); /* Interrupt voice, as when enqueue is false */ +int shutup(void); /* Interrupt voice, as when enqueue is false */ /***************** Private implementation *****************/ @@ -377,7 +377,7 @@ int do_shutup(void) } /* Shutup the voice, except if force_enqueue_next is set. */ -static int shutup(void) +int shutup(void) { if (!force_enqueue_next) return do_shutup(); diff --git a/apps/talk.h b/apps/talk.h index a95fc27a28..e25a11c702 100644 --- a/apps/talk.h +++ b/apps/talk.h @@ -78,6 +78,7 @@ bool talk_menus_enabled(void); /* returns true if menus should be voiced */ void talk_disable_menus(void); /* disable voice menus (temporarily, not persisted) */ void talk_enable_menus(void); /* re-enable voice menus */ int do_shutup(void); /* kill voice unconditionally */ +int shutup(void); /* Interrupt voice, as when enqueue is false */ #if CONFIG_RTC /* this is in talk.c which isnt compiled for hwcodec simulator */ @@ -98,6 +99,7 @@ void talk_date_time(struct tm *time, bool speak_current_time_string); #define talk_ids(...) #define cond_talk_ids(...) #define cond_talk_ids_fq(...) +#define shutup(...) #else /* Enqueue next utterance even if enqueue parameter is false: don't -- cgit v1.2.3