summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Pennequin <nicolas.pennequin@free.fr>2008-04-15 20:59:47 +0000
committerNicolas Pennequin <nicolas.pennequin@free.fr>2008-04-15 20:59:47 +0000
commitbabd3beee38cec483e7a20f4fba0c95867f2945d (patch)
tree5366594676970146ad14f1c7908f8739345759dd
parentd88c5667d9bef918259b2e1719315a4e948be30a (diff)
downloadrockbox-babd3beee38cec483e7a20f4fba0c95867f2945d.zip
rockbox-babd3beee38cec483e7a20f4fba0c95867f2945d.tar.gz
rockbox-babd3beee38cec483e7a20f4fba0c95867f2945d.tar.bz2
rockbox-babd3beee38cec483e7a20f4fba0c95867f2945d.tar.xz
audio_current_track: take wps_offset into account when no buffered metadata is available, and avoid using playlist_peek, which hits on the disk when dircache isn't enabled. This should make skipping nicer.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17128 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/playback.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/playback.c b/apps/playback.c
index 38da93b..c4b5320 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -542,6 +542,7 @@ struct mp3entry* audio_current_track(void)
const char *filename;
const char *p;
static struct mp3entry temp_id3;
+ struct playlist_track_info trackinfo;
int cur_idx;
int offset = ci.new_track + wps_offset;
@@ -572,7 +573,8 @@ struct mp3entry* audio_current_track(void)
memset(&temp_id3, 0, sizeof(struct mp3entry));
- filename = playlist_peek(0);
+ playlist_get_track_info(NULL, playlist_next(0)+wps_offset, &trackinfo);
+ filename = trackinfo.filename;
if (!filename)
filename = "No file!";