fixup! WIP Cuesheet improvements

Remove cue->curr_track
Change-Id: I5643b10e95fb8ad0f717a248f4a714c4ae5b8202

Change-Id: I97a9ca291cac27cef3f98f79d744fe667f328a72

Author: bahusoid

apps/cuesheet.c

@@ -265,9 +265,8 @@ bool parse_cuesheet(struct cuesheet_file *cue_file, struct cuesheet *cue)
         strcpy(cue->file, cue->path);
 
     struct cue_track_info* cue_track;
-    cue->curr_track = &get_track(0);
     void* buffer = cue->tracks;
-    void* buffer_end  = cue->curr_track;
+    void* buffer_end  = &get_track(0);
     while ((line_len = read_line(fd, line, read_bytes)) > 0)
     {
         if (char_enc == CHAR_ENC_UTF_16_LE)
@@ -450,12 +449,11 @@ static bool seek(unsigned long pos)
    and updates the information about the current track. */
 int cue_find_current_track(struct cuesheet *cue, unsigned long curpos)
 {
-    int i = curpos > cue->curr_track->offset ? cue->curr_track_idx: 0;
+    int i = curpos > get_cue_curr_track(cue)->offset ? cue->curr_track_idx: 0;
     while (i < cue->track_count - 1 && get_track(i+1).offset < curpos)
         i++;
 
     cue->curr_track_idx = i;
-    cue->curr_track = &get_track(i);
     return i;
 }
 
@@ -651,7 +649,7 @@ void cue_draw_markers(struct screen *screen, struct cuesheet *cue,
 bool cuesheet_subtrack_changed(struct mp3entry *id3)
 {
     struct cuesheet *cue = id3->cuesheet;
-    if (cue && (id3->elapsed < cue->curr_track->offset
+    if (cue && (id3->elapsed < get_cue_curr_track(cue)->offset
             || (cue->curr_track_idx < cue->track_count - 1
                 && id3->elapsed >= get_cue_track(cue, cue->curr_track_idx + 1)->offset)))
     {

apps/cuesheet.h

@@ -51,14 +51,18 @@ struct cuesheet {
     struct cue_track_info tracks[MAX_LIST];
 
     int curr_track_idx;
-    struct cue_track_info* curr_track;
 };
 
 static FORCE_INLINE struct cue_track_info* get_cue_track(struct cuesheet *cue, int index)
 {
     return &cue->tracks[MAX_LIST - index - 1];
 }
 
+static FORCE_INLINE struct cue_track_info* get_cue_curr_track(struct cuesheet *cue)
+{
+    return &cue->tracks[cue->curr_track_idx];
+}
+
 struct cuesheet_file {
     char path[MAX_PATH];
     int size;

apps/gui/skin_engine/skin_tokens.c

@@ -166,29 +166,15 @@ 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)
+    if (!cue)
         return NULL;
 
-    struct cue_track_info *track = cue->curr_track;
-    if (offset_tracks)
-    {
-        if (cue->curr_track_idx+offset_tracks < cue->track_count)
-            track = get_cue_track(cue, cue->curr_track_idx+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_PLAYLIST_ENTRIES:
             snprintf(buf, buf_size, "%d", cue->track_count);
             return buf;
@@ -200,7 +186,23 @@ const char *get_cuesheetid3_token(struct wps_token *token, struct mp3entry *id3,
                      cue->curr_track_idx+offset_tracks+1, cue->track_count);
             return buf;
         default:
-            return NULL;
+            break;
+    }
+
+    if(cue->curr_track_idx+offset_tracks >= cue->track_count)
+        return NULL;
+
+    struct cue_track_info *track = get_cue_track(cue, cue->curr_track_idx+offset_tracks);
+    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_TRACK_TITLE:
+            return *track->title ? track->title : NULL;
+        default:
+            break;
     }
     return NULL;
 }

apps/playback.c

@@ -784,8 +784,8 @@ static void track_list_clear(unsigned int action)
             if (hid == track_list.in_progress_hid)
                 track_list.in_progress_hid = 0;
 
-            if (tbip->info.cuesheet_hid >= 0 && hid == current_hid)
-                id3_get(PLAYING_ID3)->cuesheet = NULL;
+            // if (tbip->info.cuesheet_hid >= 0 && hid == current_hid)
+            //     id3_get(PLAYING_ID3)->cuesheet = NULL;
             track_list_free_buf_info(tbip);
         }