diff options
author | Miika Pekkarinen <miipekk@ihme.org> | 2005-06-29 21:13:46 +0000 |
---|---|---|
committer | Miika Pekkarinen <miipekk@ihme.org> | 2005-06-29 21:13:46 +0000 |
commit | 7b7d1e6802a48fd924f42c46e2ef72d170ba7c23 (patch) | |
tree | c5baef7d7a3fc7d1411c3837d8ddfd8313a5f2a6 /apps/playback.c | |
parent | 848be818285a8d61894887202b28f526a009fd92 (diff) | |
download | rockbox-7b7d1e6802a48fd924f42c46e2ef72d170ba7c23.tar.gz rockbox-7b7d1e6802a48fd924f42c46e2ef72d170ba7c23.zip |
Always use crossfade if it's enabled.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6933 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/playback.c')
-rw-r--r-- | apps/playback.c | 9 |
1 files changed, 6 insertions, 3 deletions
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) | |||
986 | if (buf_ridx >= codecbuflen) | 986 | if (buf_ridx >= codecbuflen) |
987 | buf_ridx -= codecbuflen; | 987 | buf_ridx -= codecbuflen; |
988 | 988 | ||
989 | pcm_crossfade_init(); | 989 | if (!pcm_crossfade_init()) |
990 | pcm_flush_audio(); | ||
991 | |||
990 | if (!filling) | 992 | if (!filling) |
991 | pcm_set_boost_mode(false); | 993 | pcm_set_boost_mode(false); |
992 | } else { | 994 | } else { |
@@ -1140,7 +1142,8 @@ void audio_thread(void) | |||
1140 | ci.stop_codec = true; | 1142 | ci.stop_codec = true; |
1141 | ci.reload_codec = false; | 1143 | ci.reload_codec = false; |
1142 | ci.seek_time = 0; | 1144 | ci.seek_time = 0; |
1143 | pcm_flush_audio(); | 1145 | if (!pcm_crossfade_init()) |
1146 | pcm_flush_audio(); | ||
1144 | audio_play_start((int)ev.data); | 1147 | audio_play_start((int)ev.data); |
1145 | break ; | 1148 | break ; |
1146 | 1149 | ||
@@ -1349,7 +1352,7 @@ static void initiate_track_change(int peek_index) | |||
1349 | } | 1352 | } |
1350 | 1353 | ||
1351 | else if (!pcm_crossfade_init()) { | 1354 | else if (!pcm_crossfade_init()) { |
1352 | //pcm_play_stop(); | 1355 | pcm_flush_audio(); |
1353 | } | 1356 | } |
1354 | } | 1357 | } |
1355 | 1358 | ||