forked from len0rd/rockbox
Export shutup() function from talk.c.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15061 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
d529a3845b
commit
3e31d50955
2 changed files with 4 additions and 2 deletions
|
|
@ -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 queue_clip(unsigned char* buf, long size, bool enqueue);
|
||||||
static int open_voicefile(void);
|
static int open_voicefile(void);
|
||||||
static unsigned char* get_clip(long id, long* p_size);
|
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 *****************/
|
/***************** Private implementation *****************/
|
||||||
|
|
||||||
|
|
@ -377,7 +377,7 @@ int do_shutup(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Shutup the voice, except if force_enqueue_next is set. */
|
/* Shutup the voice, except if force_enqueue_next is set. */
|
||||||
static int shutup(void)
|
int shutup(void)
|
||||||
{
|
{
|
||||||
if (!force_enqueue_next)
|
if (!force_enqueue_next)
|
||||||
return do_shutup();
|
return do_shutup();
|
||||||
|
|
|
||||||
|
|
@ -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_disable_menus(void); /* disable voice menus (temporarily, not persisted) */
|
||||||
void talk_enable_menus(void); /* re-enable voice menus */
|
void talk_enable_menus(void); /* re-enable voice menus */
|
||||||
int do_shutup(void); /* kill voice unconditionally */
|
int do_shutup(void); /* kill voice unconditionally */
|
||||||
|
int shutup(void); /* Interrupt voice, as when enqueue is false */
|
||||||
|
|
||||||
#if CONFIG_RTC
|
#if CONFIG_RTC
|
||||||
/* this is in talk.c which isnt compiled for hwcodec simulator */
|
/* 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 talk_ids(...)
|
||||||
#define cond_talk_ids(...)
|
#define cond_talk_ids(...)
|
||||||
#define cond_talk_ids_fq(...)
|
#define cond_talk_ids_fq(...)
|
||||||
|
#define shutup(...)
|
||||||
#else
|
#else
|
||||||
|
|
||||||
/* Enqueue next utterance even if enqueue parameter is false: don't
|
/* Enqueue next utterance even if enqueue parameter is false: don't
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue