From 03b43e108be519f6fdffeb83c923a65fba292a50 Mon Sep 17 00:00:00 2001 From: Nicolas Pennequin Date: Thu, 25 Oct 2007 01:26:18 +0200 Subject: [PATCH] Revert to calling playlist_next() in check_new_track() as in SVN. Calling playlist_next() on PCM track change was the cause of the auto change directory bug. playlist_next() needs to be called to provide the new playlist. If we call it on the PCM track change, it's too late. The downside of reverting to the SVN behaviour is that the playlist index displayed in the WPS and the position in the playlist viewer get updated too early. Until a better solution is found, the same behaviour as SVN is acceptable. --- apps/playback.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/playback.c b/apps/playback.c index 41e9909a6..eb81f0b6a 100644 --- a/apps/playback.c +++ b/apps/playback.c @@ -2767,7 +2767,7 @@ static int audio_check_new_track(void) /* Update the playlist */ last_peek_offset -= ci.new_track; - if (!automatic_skip && playlist_next(ci.new_track) < 0) + if (playlist_next(ci.new_track) < 0) { LOGFQUEUE("audio >|= codec Q_CODEC_REQUEST_FAILED"); return Q_CODEC_REQUEST_FAILED; @@ -3270,7 +3270,6 @@ static void audio_thread(void) LOGFQUEUE("audio < Q_AUDIO_TRACK_CHANGED"); if (automatic_skip) { - playlist_next(-wps_offset); wps_offset = 0; automatic_skip = false; prevtrack_id3.path[0] = 0; -- 2.11.4.GIT