summaryrefslogtreecommitdiff
path: root/apps/talk.c
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2007-08-29 15:11:19 +0000
committerNils Wallménius <nils@rockbox.org>2007-08-29 15:11:19 +0000
commit441fa76a6d23128169ed6c3768f014808df88329 (patch)
tree8b39e11d68dad2e31777351b241c8ed83668c538 /apps/talk.c
parent12c82bdb779d104cbff3a5e5058424357d5dadf8 (diff)
downloadrockbox-441fa76a6d23128169ed6c3768f014808df88329.tar.gz
rockbox-441fa76a6d23128169ed6c3768f014808df88329.zip
Fix flushing of voice during playback, patch in FS#6239 by Stephane Doyon and Daniel Dalton
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14517 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/talk.c')
-rw-r--r--apps/talk.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/apps/talk.c b/apps/talk.c
index 9e73f71084..b9d5bc2aa7 100644
--- a/apps/talk.c
+++ b/apps/talk.c
@@ -141,7 +141,6 @@ static 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 */ 143static int shutup(void); /* Interrupt voice, as when enqueue is false */
144static int do_shutup(void); /* kill voice unconditionally */
145 144
146/***************** Private implementation *****************/ 145/***************** Private implementation *****************/
147 146
@@ -311,7 +310,7 @@ re_check:
311} 310}
312 311
313/* stop the playback and the pending clips */ 312/* stop the playback and the pending clips */
314static int do_shutup(void) 313int do_shutup(void)
315{ 314{
316#if CONFIG_CODEC != SWCODEC 315#if CONFIG_CODEC != SWCODEC
317 unsigned char* pos; 316 unsigned char* pos;