From babd3beee38cec483e7a20f4fba0c95867f2945d Mon Sep 17 00:00:00 2001
From: Nicolas Pennequin <nicolas.pennequin@free.fr>
Date: Tue, 15 Apr 2008 20:59:47 +0000
Subject: [PATCH] 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
---
 apps/playback.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/playback.c b/apps/playback.c
index 38da93b6c7..c4b53204cf 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!";