Rework the skin playlist viewer so it uses the same drawing code as everything else. This should mean that all text tags now work as expected. The 2nd code param is no longer needed so drop it (you can use conditionals and sublines and stuff in the one code param.

example: %Vp(1, %?it<%in -%it|%fn>) <- show the next tracks strating from the first next track and show info if it is avilable or the filename.
Basic cuesheet support here, and will load upcoming track tags from the database if you have load to ram enabled.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27814 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 3 insertions, 10 deletions

diff --git a/apps/gui/skin_engine/wps_internals.h b/apps/gui/skin_engine/wps_internals.h
index e1516bd..ccae11b 100644
--- a/apps/gui/skin_engine/wps_internals.h
+++ b/apps/gui/skin_engine/wps_internals.h
@@ -194,18 +194,11 @@ struct touchregion {
 };
 #endif
 
-enum info_line_type {
-    TRACK_HAS_INFO = 0,
-    TRACK_HAS_NO_INFO
-};
 struct playlistviewer {
     struct viewport *vp;
     bool show_icons;
     int start_offset;
-#ifdef HAVE_TC_RAMCACHE
-    struct mp3entry tempid3;
-#endif
-    struct skin_element *lines[2];
+    struct skin_element *line;
 };
 
 
@@ -334,7 +327,7 @@ char *get_image_filename(const char *start, const char* bmpdir,
 /***** wps_tokens.c ******/
 
 const char *get_token_value(struct gui_wps *gwps,
-                           struct wps_token *token,
+                           struct wps_token *token, int offset,
                            char *buf, int buf_size,
                            int *intval);
 
@@ -342,7 +335,7 @@ const char *get_token_value(struct gui_wps *gwps,
 const char *get_cuesheetid3_token(struct wps_token *token, struct mp3entry *id3,
                                   int offset_tracks, char *buf, int buf_size);
 const char *get_id3_token(struct wps_token *token, struct mp3entry *id3,
-                          char *buf, int buf_size, int limit, int *intval);
+                          char *filename, char *buf, int buf_size, int limit, int *intval);
 #if CONFIG_TUNER
 const char *get_radio_token(struct wps_token *token, int preset_offset,
                             char *buf, int buf_size, int limit, int *intval);