summaryrefslogtreecommitdiff
path: root/apps/playback.c
diff options
context:
space:
mode:
authorMichael Hohmuth <sideral@rockbox.org>2011-02-28 23:57:35 +0000
committerMichael Hohmuth <sideral@rockbox.org>2011-02-28 23:57:35 +0000
commit7df5ecc783aae64df4a0344bb5a69750cd1cf051 (patch)
treec0e328c08971bf8da392e155472d3332eca3eb0b /apps/playback.c
parentb016ab9d8654ec3cfdee7a9dbe9966142ce37488 (diff)
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
Diffstat (limited to 'apps/playback.c')
-rw-r--r--apps/playback.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/playback.c b/apps/playback.c
index db07613bc8..5ee5166cd9 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -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