2 files changed, 41 insertions, 0 deletions

diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c
index c5e1ebc831..a05327907d 100644
--- a/apps/gui/skin_engine/skin_tokens.c
+++ b/apps/gui/skin_engine/skin_tokens.c
@@ -155,6 +155,42 @@ static int pitch_speed_enum(int range, int32_t val, int32_t normval)
 }
 #endif
 
+const char *get_cuesheetid3_token(struct wps_token *token, struct mp3entry *id3,
+                                  int offset_tracks, char *buf, int buf_size)
+{
+    struct cuesheet *cue = id3?id3->cuesheet:NULL;
+    if (!cue || !cue->curr_track)
+        return NULL;
+    
+    struct cue_track_info *track = cue->curr_track;
+    if (offset_tracks)
+    {
+        if (cue->curr_track_idx+offset_tracks < cue->track_count)
+            track+=offset_tracks;
+        else
+            return NULL;
+    }
+    switch (token->type)
+    {
+        case SKIN_TOKEN_METADATA_ARTIST:
+            return *track->performer ? track->performer : NULL;
+        case SKIN_TOKEN_METADATA_COMPOSER:
+            return *track->songwriter ? track->songwriter : NULL;
+        case SKIN_TOKEN_METADATA_ALBUM:
+            return *cue->title ? cue->title : NULL;
+        case SKIN_TOKEN_METADATA_ALBUM_ARTIST:
+            return *cue->performer ? cue->performer : NULL;
+        case SKIN_TOKEN_METADATA_TRACK_TITLE:
+            return *track->title ? track->title : NULL;
+        case SKIN_TOKEN_METADATA_TRACK_NUMBER:
+            snprintf(buf, buf_size, "%d/%d",  
+                     cue->curr_track_idx+offset_tracks+1, cue->track_count);
+            return buf;
+        default:
+            return NULL;
+    }
+    return NULL;
+}
 
 /* All tokens which only need the info to return a value go in here */
 const char *get_id3_token(struct wps_token *token, struct mp3entry *id3,
@@ -1392,3 +1428,5 @@ const char *get_token_value(struct gui_wps *gwps,
             return NULL;
     }
 }
+
+
diff --git a/apps/gui/skin_engine/wps_internals.h b/apps/gui/skin_engine/wps_internals.h
index ec37560e79..f8e025956e 100644
--- a/apps/gui/skin_engine/wps_internals.h
+++ b/apps/gui/skin_engine/wps_internals.h
@@ -329,6 +329,9 @@ const char *get_token_value(struct gui_wps *gwps,
                            char *buf, int buf_size,
                            int *intval);
 
+/* Get the id3 fields from the cuesheet */
+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);
 #if CONFIG_TUNER