more cuesheet cleanup. pass the cuesheet into cue functions so they dont have to call audio_current_track()

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

2 files changed, 3 insertions, 3 deletions

diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c
index da70f0e451..721682f248 100644
--- a/apps/gui/gwps-common.c
+++ b/apps/gui/gwps-common.c
@@ -412,7 +412,7 @@ static void draw_progressbar(struct gui_wps *gwps,
 #endif
 
     if (state->id3->cuesheet)
-        cue_draw_markers(display, state->id3->length,
+        cue_draw_markers(display, state->id3->cuesheet, state->id3->length,
                          pb->x, pb->x + pb->width, y+1, pb->height-2);
 }
 
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c
index 154864a280..10c2a6806b 100644
--- a/apps/gui/gwps.c
+++ b/apps/gui/gwps.c
@@ -151,7 +151,7 @@ static void prev_track(unsigned long skip_thresh)
     {
         if (wps_state.id3->cuesheet)
         {
-            curr_cuesheet_skip(-1, wps_state.id3->elapsed);
+            curr_cuesheet_skip(wps_state.id3->cuesheet, -1, wps_state.id3->elapsed);
             return;
         }
 
@@ -176,7 +176,7 @@ static void next_track(void)
     /* take care of if we're playing a cuesheet */
     if (wps_state.id3->cuesheet)
     {
-        if (curr_cuesheet_skip(1, wps_state.id3->elapsed))
+        if (curr_cuesheet_skip(wps_state.id3->cuesheet, 1, wps_state.id3->elapsed))
         {
             /* if the result was false, then we really want
                to skip to the next track */