diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-11-01 13:36:52 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-11-01 13:36:52 +0000 |
commit | 6db726c147624c4b2f9d80603e9d4f46cb9cd5e3 (patch) | |
tree | 945f3167ddf8b34eeede4ed788a4c5f07f2cf0d8 /apps/gui/skin_engine | |
parent | add481bf6d80514953b683f74d3091828e634126 (diff) | |
download | rockbox-6db726c147624c4b2f9d80603e9d4f46cb9cd5e3.tar.gz rockbox-6db726c147624c4b2f9d80603e9d4f46cb9cd5e3.zip |
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
Diffstat (limited to 'apps/gui/skin_engine')
-rw-r--r-- | apps/gui/skin_engine/skin_tokens.c | 3 | ||||
-rw-r--r-- | apps/gui/skin_engine/wps_internals.h | 7 |
2 files changed, 5 insertions, 5 deletions
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 @@ | |||
53 | #include "viewport.h" | 53 | #include "viewport.h" |
54 | 54 | ||
55 | #include "wps_internals.h" | 55 | #include "wps_internals.h" |
56 | #include "wps.h" | ||
57 | #include "root_menu.h" | 56 | #include "root_menu.h" |
58 | #ifdef HAVE_RECORDING | 57 | #ifdef HAVE_RECORDING |
59 | #include "recording.h" | 58 | #include "recording.h" |
@@ -525,7 +524,7 @@ const char *get_token_value(struct gui_wps *gwps, | |||
525 | int mode = 1; /* stop */ | 524 | int mode = 1; /* stop */ |
526 | if (status == STATUS_PLAY) | 525 | if (status == STATUS_PLAY) |
527 | mode = 2; /* play */ | 526 | mode = 2; /* play */ |
528 | if (is_wps_fading() || | 527 | if (state->is_fading || |
529 | (status == STATUS_PAUSE && !status_get_ffmode())) | 528 | (status == STATUS_PAUSE && !status_get_ffmode())) |
530 | mode = 3; /* pause */ | 529 | mode = 3; /* pause */ |
531 | else | 530 | 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 | |||
288 | and some status infos */ | 288 | and some status infos */ |
289 | struct wps_state | 289 | struct wps_state |
290 | { | 290 | { |
291 | struct mp3entry* id3; | ||
292 | struct mp3entry* nid3; | ||
293 | int ff_rewind_count; | ||
291 | bool ff_rewind; | 294 | bool ff_rewind; |
292 | bool paused; | 295 | bool paused; |
293 | int ff_rewind_count; | ||
294 | bool wps_time_countup; | 296 | bool wps_time_countup; |
295 | struct mp3entry* id3; | 297 | bool is_fading; |
296 | struct mp3entry* nid3; | ||
297 | }; | 298 | }; |
298 | 299 | ||
299 | /* Holds data for all screens in a skin. */ | 300 | /* Holds data for all screens in a skin. */ |