From 7b7d1e6802a48fd924f42c46e2ef72d170ba7c23 Mon Sep 17 00:00:00 2001 From: Miika Pekkarinen Date: Wed, 29 Jun 2005 21:13:46 +0000 Subject: Always use crossfade if it's enabled. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6933 a1c6a512-1295-4272-9138-f99709370657 --- apps/playback.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'apps/playback.c') diff --git a/apps/playback.c b/apps/playback.c index dccf632dc9..55829a0031 100644 --- a/apps/playback.c +++ b/apps/playback.c @@ -986,7 +986,9 @@ void audio_update_trackinfo(void) if (buf_ridx >= codecbuflen) buf_ridx -= codecbuflen; - pcm_crossfade_init(); + if (!pcm_crossfade_init()) + pcm_flush_audio(); + if (!filling) pcm_set_boost_mode(false); } else { @@ -1140,7 +1142,8 @@ void audio_thread(void) ci.stop_codec = true; ci.reload_codec = false; ci.seek_time = 0; - pcm_flush_audio(); + if (!pcm_crossfade_init()) + pcm_flush_audio(); audio_play_start((int)ev.data); break ; @@ -1349,7 +1352,7 @@ static void initiate_track_change(int peek_index) } else if (!pcm_crossfade_init()) { - //pcm_play_stop(); + pcm_flush_audio(); } } -- cgit v1.2.3