rework cuesheet support:

swcodec: search for a .cue during buffering (with the possibility of adding embedded cuesheets later)
hwcodec: search for a .cue when the id3 info for the current track is requested for the first time (disk should be spining so non issue)

major beenfit from this is simplofy cuesheet handling code a bit... if mp3entry.cuesheet != NULL then there is a valid cuesheet.. no need to worry about if its enabled and preloaded.
There is the possibility of putting the next/prev subtrack handling inside the playback code (as well as the id3 updating stuff (see FS#9789 for more info), but thats probably not a good idea.


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

1 files changed, 3 insertions, 13 deletions

diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c
index c0923a9ab5..dd6ac02d85 100644
--- a/apps/gui/gwps-common.c
+++ b/apps/gui/gwps-common.c
@@ -355,18 +355,8 @@ bool gui_wps_update(struct gui_wps *gwps)
 {
     struct mp3entry *id3 = gwps->state->id3;
     bool retval;
-    if (cuesheet_is_enabled() && id3->cuesheet_type
-        && (id3->elapsed < curr_cue->curr_track->offset
-            || (curr_cue->curr_track_idx < curr_cue->track_count - 1
-                && id3->elapsed >= (curr_cue->curr_track+1)->offset)))
-    {
-        /* We've changed tracks within the cuesheet :
-           we need to update the ID3 info and refresh the WPS */
-        gwps->state->do_full_update = true;
-        cue_find_current_track(curr_cue, id3->elapsed);
-        cue_spoof_id3(curr_cue, id3);
-    }
-
+    gwps->state->do_full_update = gwps->state->do_full_update ||
+                                  cuesheet_subtrack_changed(id3);
     retval = gui_wps_redraw(gwps, 0,
                             gwps->state->do_full_update ? 
                                         WPS_REFRESH_ALL : WPS_REFRESH_NON_STATIC);
@@ -421,7 +411,7 @@ static void draw_progressbar(struct gui_wps *gwps,
                         pb->x, pb->x + pb->width, y, pb->height);
 #endif
 
-    if ( cuesheet_is_enabled() && state->id3->cuesheet_type )
+    if (state->id3->cuesheet)
         cue_draw_markers(display, state->id3->length,
                          pb->x, pb->x + pb->width, y+1, pb->height-2);
 }