summaryrefslogtreecommitdiff
path: root/apps/talk.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/talk.c')
-rw-r--r--apps/talk.c9
1 files changed, 2 insertions, 7 deletions
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:
311 else 311 else
312 { 312 {
313 *size = 0; /* end of data */ 313 *size = 0; /* end of data */
314 mp3_play_stop(); /* fixme: should be done by caller */
315 } 314 }
316} 315}
317 316
318/* stop the playback and the pending clips, but at frame boundary */ 317/* stop the playback and the pending clips */
319static int shutup(void) 318static int shutup(void)
320{ 319{
321#if CONFIG_CODEC != SWCODEC 320#if CONFIG_CODEC != SWCODEC
@@ -327,7 +326,7 @@ static int shutup(void)
327 if (QUEUE_LEVEL == 0) /* has ended anyway */ 326 if (QUEUE_LEVEL == 0) /* has ended anyway */
328 { 327 {
329#if CONFIG_CODEC == SWCODEC 328#if CONFIG_CODEC == SWCODEC
330 mp3_play_abort(); 329 mp3_play_stop();
331#endif 330#endif
332 return 0; 331 return 0;
333 } 332 }
@@ -375,11 +374,7 @@ static int shutup(void)
375#endif 374#endif
376 375
377 /* nothing to do, was frame boundary or not our clip */ 376 /* nothing to do, was frame boundary or not our clip */
378#if CONFIG_CODEC == SWCODEC
379 mp3_play_abort();
380#else
381 mp3_play_stop(); 377 mp3_play_stop();
382#endif
383 378
384 queue_write = queue_read = 0; /* reset the queue */ 379 queue_write = queue_read = 0; /* reset the queue */
385 380