From 71dd94a7eb42dfc29d8b454d00df6debd7d34a65 Mon Sep 17 00:00:00 2001 From: Steve Bavin Date: Wed, 25 Oct 2006 08:54:25 +0000 Subject: A bit more voice simplification/MAS fixage (FS#6241). Also clear any buffered voice when playback is started. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11334 a1c6a512-1295-4272-9138-f99709370657 --- apps/talk.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'apps/talk.c') diff --git a/apps/talk.c b/apps/talk.c index fd28fdfd71..d81aa082c9 100644 --- a/apps/talk.c +++ b/apps/talk.c @@ -311,11 +311,10 @@ re_check: else { *size = 0; /* end of data */ - mp3_play_stop(); /* fixme: should be done by caller */ } } -/* stop the playback and the pending clips, but at frame boundary */ +/* stop the playback and the pending clips */ static int shutup(void) { #if CONFIG_CODEC != SWCODEC @@ -327,7 +326,7 @@ static int shutup(void) if (QUEUE_LEVEL == 0) /* has ended anyway */ { #if CONFIG_CODEC == SWCODEC - mp3_play_abort(); + mp3_play_stop(); #endif return 0; } @@ -375,11 +374,7 @@ static int shutup(void) #endif /* nothing to do, was frame boundary or not our clip */ -#if CONFIG_CODEC == SWCODEC - mp3_play_abort(); -#else mp3_play_stop(); -#endif queue_write = queue_read = 0; /* reset the queue */ -- cgit v1.2.3