autoresume: Optimize playlist resume (manual, bookmark, or after power-on)

The resume position coming from these sources takes precedence over
autoresume.  If we have such a resume offset, we don't have to wait
for the database to produce a resume offset before we can start the
codec.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29470 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Hohmuth 2011-02-28 23:57:35 +00:00
parent b016ab9d86
commit 7df5ecc783

View file

@ -1467,7 +1467,7 @@ static void audio_finish_load_track(void)
must wait until after PLAYBACK_EVENT_TRACK_BUFFER, which may
generate a resume position. */
#ifdef HAVE_TAGCACHE
if (! global_settings.autoresume_enable)
if (!global_settings.autoresume_enable || offset)
#endif
tracks[track_widx].taginfo_ready = true;
@ -1482,7 +1482,7 @@ static void audio_finish_load_track(void)
#ifdef HAVE_TAGCACHE
/* In case the autoresume feature has been enabled, finally all
required data is available for the codec. */
if (global_settings.autoresume_enable)
if (global_settings.autoresume_enable && !offset)
tracks[track_widx].taginfo_ready = true;
#endif