From 6db726c147624c4b2f9d80603e9d4f46cb9cd5e3 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Sun, 1 Nov 2009 13:36:52 +0000 Subject: Remove a wps function call from skin engine, hopefully the last one. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23461 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/skin_engine/skin_tokens.c | 3 +-- apps/gui/skin_engine/wps_internals.h | 7 ++++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'apps/gui/skin_engine') diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c index fad6912336..46adbdc097 100644 --- a/apps/gui/skin_engine/skin_tokens.c +++ b/apps/gui/skin_engine/skin_tokens.c @@ -53,7 +53,6 @@ #include "viewport.h" #include "wps_internals.h" -#include "wps.h" #include "root_menu.h" #ifdef HAVE_RECORDING #include "recording.h" @@ -525,7 +524,7 @@ const char *get_token_value(struct gui_wps *gwps, int mode = 1; /* stop */ if (status == STATUS_PLAY) mode = 2; /* play */ - if (is_wps_fading() || + if (state->is_fading || (status == STATUS_PAUSE && !status_get_ffmode())) mode = 3; /* pause */ else diff --git a/apps/gui/skin_engine/wps_internals.h b/apps/gui/skin_engine/wps_internals.h index d54b54ff00..8763ef9e3d 100644 --- a/apps/gui/skin_engine/wps_internals.h +++ b/apps/gui/skin_engine/wps_internals.h @@ -288,12 +288,13 @@ struct wps_data and some status infos */ struct wps_state { + struct mp3entry* id3; + struct mp3entry* nid3; + int ff_rewind_count; bool ff_rewind; bool paused; - int ff_rewind_count; bool wps_time_countup; - struct mp3entry* id3; - struct mp3entry* nid3; + bool is_fading; }; /* Holds data for all screens in a skin. */ -- cgit v1.2.3