summaryrefslogtreecommitdiffstats
path: root/apps/playback.c
diff options
context:
space:
mode:
authorMiika Pekkarinen <miipekk@ihme.org>2005-07-02 17:45:12 +0000
committerMiika Pekkarinen <miipekk@ihme.org>2005-07-02 17:45:12 +0000
commitb469e732465be7c7174669edbec75ad9274424b9 (patch)
treebe24f00a5e95d464e7e4aa2dfc21ede60ba010d2 /apps/playback.c
parent9c70b1b562ce9e5047f814f8613f5cda4f436d14 (diff)
downloadrockbox-b469e732465be7c7174669edbec75ad9274424b9.tar.gz
rockbox-b469e732465be7c7174669edbec75ad9274424b9.zip
Use correct timing to display the next track wps screen when crossfade
is activated. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6988 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/playback.c')
-rw-r--r--apps/playback.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/apps/playback.c b/apps/playback.c
index 291f45eea3..37252fae76 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -561,7 +561,7 @@ bool codec_seek_buffer_callback(off_t newpos)
buf_ridx = codecbuflen + buf_ridx;
ci.curpos -= difference;
if (!pcm_is_crossfade_active())
- pcm_play_stop();
+ pcm_play_stop();
return true;
}
@@ -1093,8 +1093,6 @@ void audio_update_trackinfo(void)
if (buf_ridx >= codecbuflen)
buf_ridx -= codecbuflen;
- pcm_crossfade_init();
-
if (!filling)
pcm_set_boost_mode(false);
} else {
@@ -1118,7 +1116,10 @@ void audio_update_trackinfo(void)
ci.curpos = 0;
cur_ti->start_pos = 0;
ci.taginfo_ready = (bool *)&cur_ti->taginfo_ready;
- audiobuffer_add_event(codec_track_changed);
+ if (!pcm_crossfade_init())
+ audiobuffer_add_event(codec_track_changed);
+ else
+ codec_track_changed();
}
static void audio_stop_playback(void)