6 files changed, 10 insertions, 39 deletions

diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c
index 3e3f203f9a..49375829e6 100644
--- a/apps/gui/skin_engine/skin_display.c
+++ b/apps/gui/skin_engine/skin_display.c
@@ -65,7 +65,7 @@
 #endif
 #include "root_menu.h"
 
-
+#include "wps.h"
 #include "wps_internals.h"
 #include "skin_engine.h"
 #include "statusbar-skinned.h"
@@ -83,7 +83,7 @@ void skin_update(enum skinnable_screens skin, enum screen_type screen,
     struct gui_wps *gwps = skin_get_gwps(skin, screen);
     /* This maybe shouldnt be here,
      * This is also safe for skined screen which dont use the id3 */
-    struct mp3entry *id3 = skin_get_global_state()->id3;
+    struct mp3entry *id3 = get_wps_state()->id3;
     bool cuesheet_update = (id3 != NULL ? cuesheet_subtrack_changed(id3) : false);
     if (cuesheet_update)
         skin_request_full_update(skin);
@@ -162,7 +162,7 @@ void draw_progressbar(struct gui_wps *gwps, int line, struct progressbar *pb)
 {
     struct screen *display = gwps->display;
     struct viewport *vp = SKINOFFSETTOPTR(get_skin_buffer(gwps->data), pb->vp);
-    struct wps_state *state = skin_get_global_state();
+    struct wps_state *state = get_wps_state();
     struct mp3entry *id3 = state->id3;
     int x = pb->x, y = pb->y, width = pb->width, height = pb->height;
     unsigned long length, end;
diff --git a/apps/gui/skin_engine/skin_engine.c b/apps/gui/skin_engine/skin_engine.c
index a3ad85fd6e..c007ed35d4 100644
--- a/apps/gui/skin_engine/skin_engine.c
+++ b/apps/gui/skin_engine/skin_engine.c
@@ -53,7 +53,6 @@ static bool skins_initialised = false;
 static char* get_skin_filename(char *buf, size_t buf_size,
                                enum skinnable_screens skin, enum screen_type screen);
 
-struct wps_state     wps_state               = { .id3 = NULL };
 static struct gui_skin_helper {
     int (*preproccess)(enum screen_type screen, struct wps_data *data);
     int (*postproccess)(enum screen_type screen, struct wps_data *data);
@@ -310,11 +309,6 @@ struct gui_wps *skin_get_gwps(enum skinnable_screens skin, enum screen_type scre
     return &skins[skin][screen].gui_wps;
 }
 
-struct wps_state *skin_get_global_state(void)
-{
-    return &wps_state;
-}
-
 /* This is called to find out if we the screen needs a full update.
  * if true you MUST do a full update as the next call will return false */
 bool skin_do_full_update(enum skinnable_screens skin,
diff --git a/apps/gui/skin_engine/skin_engine.h b/apps/gui/skin_engine/skin_engine.h
index d7efb5b888..a685f4f072 100644
--- a/apps/gui/skin_engine/skin_engine.h
+++ b/apps/gui/skin_engine/skin_engine.h
@@ -85,7 +85,6 @@ int skin_wait_for_action(enum skinnable_screens skin, int context, int timeout);
 void skin_load(enum skinnable_screens skin, enum screen_type screen,
                const char *buf, bool isfile);
 struct gui_wps *skin_get_gwps(enum skinnable_screens skin, enum screen_type screen);
-struct wps_state *skin_get_global_state(void);
 void gui_sync_skin_init(void);
 
 void skin_unload_all(void);
diff --git a/apps/gui/skin_engine/skin_render.c b/apps/gui/skin_engine/skin_render.c
index 2238bd9bec..e5d2078177 100644
--- a/apps/gui/skin_engine/skin_render.c
+++ b/apps/gui/skin_engine/skin_render.c
@@ -50,6 +50,7 @@
 #include "root_menu.h"
 #include "misc.h"
 #include "list.h"
+#include "wps.h"
 
 
 #define MAX_LINE 1024
@@ -956,8 +957,8 @@ void skin_render_playlistviewer(struct playlistviewer* viewer,
     else
 #endif
     {
-        struct cuesheet *cue = skin_get_global_state()->id3 ?
-                               skin_get_global_state()->id3->cuesheet : NULL;
+        struct wps_state *state = get_wps_state();
+        struct cuesheet *cue = state->id3 ? state->id3->cuesheet : NULL;
         cur_pos = playlist_get_display_index();
         max = playlist_amount()+1;
         if (cue)
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c
index 0101a5e01e..a1d0a4b840 100644
--- a/apps/gui/skin_engine/skin_tokens.c
+++ b/apps/gui/skin_engine/skin_tokens.c
@@ -66,11 +66,10 @@
 #include "fixedpoint.h"
 #endif
 #include "list.h"
+#include "wps.h"
 
 #define NOINLINE __attribute__ ((noinline))
 
-extern struct wps_state wps_state;
-
 static const char* get_codectype(const struct mp3entry* id3)
 {
     if (id3 && id3->codectype < AFMT_NUM_CODECS) {
@@ -228,7 +227,7 @@ static const char* get_filename_token(struct wps_token *token, char* filename,
 const char *get_id3_token(struct wps_token *token, struct mp3entry *id3,
                           char *filename, char *buf, int buf_size, int limit, int *intval)
 {
-    struct wps_state *state = &wps_state;
+    struct wps_state *state = get_wps_state();
     if (id3)
     {
         unsigned long length = id3->length;
@@ -540,7 +539,7 @@ const char *get_radio_token(struct wps_token *token, int preset_offset,
 static struct mp3entry* get_mp3entry_from_offset(int offset, char **filename)
 {
     struct mp3entry* pid3 = NULL;
-    struct wps_state *state = skin_get_global_state();
+    struct wps_state *state = get_wps_state();
     struct cuesheet *cue = state->id3 ? state->id3->cuesheet : NULL;
     const char *fname = NULL;
     if (cue && cue->curr_track_idx + offset < cue->track_count)
@@ -678,7 +677,7 @@ const char *get_token_value(struct gui_wps *gwps,
         return NULL;
 
     struct wps_data *data = gwps->data;
-    struct wps_state *state = skin_get_global_state();
+    struct wps_state *state = get_wps_state();
     struct mp3entry *id3; /* Think very carefully about using this.
                              maybe get_id3_token() is the better place? */
     const char *out_text = NULL;
diff --git a/apps/gui/skin_engine/wps_internals.h b/apps/gui/skin_engine/wps_internals.h
index 2aedff752b..0ae2e24235 100644
--- a/apps/gui/skin_engine/wps_internals.h
+++ b/apps/gui/skin_engine/wps_internals.h
@@ -393,28 +393,6 @@ static inline char* get_skin_buffer(struct wps_data* data)
 
 /* wps_data end */
 
-/* wps_state
-   holds the data which belongs to the current played track,
-   the track which will be played afterwards, current path to the track
-   and some status infos */
-struct wps_state
-{
-    struct mp3entry* id3;
-    struct mp3entry* nid3;
-    int  ff_rewind_count;
-    bool paused;
-};
-
-/* change the ff/rew-status
-   if ff_rew = true then we are in skipping mode
-   else we are in normal mode */
-/* void wps_state_update_ff_rew(bool ff_rew); Currently unused */
-
-/* change the tag-information of the current played track
-   and the following track */
-/* void wps_state_update_id3_nid3(struct mp3entry *id3, struct mp3entry *nid3); Currently unused */
-/* wps_state end*/
-
 /* gui_wps
    defines a wps with its data, state,
    and the screen on which the wps-content should be drawn */