summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStéphane Doyon <s.doyon@videotron.ca>2007-10-10 03:12:17 +0000
committerStéphane Doyon <s.doyon@videotron.ca>2007-10-10 03:12:17 +0000
commit3e31d509553efc5155c7b0b878fa1f24f8975bf0 (patch)
tree87700678b9828815df9a56020af1ab835e242273
parentd529a3845b1eefd396b0c0dbf177740357d03c0b (diff)
downloadrockbox-3e31d509553efc5155c7b0b878fa1f24f8975bf0.tar.gz
rockbox-3e31d509553efc5155c7b0b878fa1f24f8975bf0.zip
Export shutup() function from talk.c.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15061 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/talk.c4
-rw-r--r--apps/talk.h2
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);
140static int queue_clip(unsigned char* buf, long size, bool enqueue); 140static int queue_clip(unsigned char* buf, long size, bool enqueue);
141static int open_voicefile(void); 141static int open_voicefile(void);
142static unsigned char* get_clip(long id, long* p_size); 142static unsigned char* get_clip(long id, long* p_size);
143static int shutup(void); /* Interrupt voice, as when enqueue is false */ 143int shutup(void); /* Interrupt voice, as when enqueue is false */
144 144
145/***************** Private implementation *****************/ 145/***************** Private implementation *****************/
146 146
@@ -377,7 +377,7 @@ int do_shutup(void)
377} 377}
378 378
379/* Shutup the voice, except if force_enqueue_next is set. */ 379/* Shutup the voice, except if force_enqueue_next is set. */
380static int shutup(void) 380int shutup(void)
381{ 381{
382 if (!force_enqueue_next) 382 if (!force_enqueue_next)
383 return do_shutup(); 383 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 */
78void talk_disable_menus(void); /* disable voice menus (temporarily, not persisted) */ 78void talk_disable_menus(void); /* disable voice menus (temporarily, not persisted) */
79void talk_enable_menus(void); /* re-enable voice menus */ 79void talk_enable_menus(void); /* re-enable voice menus */
80int do_shutup(void); /* kill voice unconditionally */ 80int do_shutup(void); /* kill voice unconditionally */
81int shutup(void); /* Interrupt voice, as when enqueue is false */
81 82
82#if CONFIG_RTC 83#if CONFIG_RTC
83/* this is in talk.c which isnt compiled for hwcodec simulator */ 84/* 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);
98#define talk_ids(...) 99#define talk_ids(...)
99#define cond_talk_ids(...) 100#define cond_talk_ids(...)
100#define cond_talk_ids_fq(...) 101#define cond_talk_ids_fq(...)
102#define shutup(...)
101#else 103#else
102 104
103/* Enqueue next utterance even if enqueue parameter is false: don't 105/* Enqueue next utterance even if enqueue parameter is false: don't