diff options
author | Aidan MacDonald <amachronic@protonmail.com> | 2022-10-02 21:05:32 +0100 |
---|---|---|
committer | Aidan MacDonald <amachronic@protonmail.com> | 2022-10-18 12:56:28 +0100 |
commit | 14fbefdf390d397a13b31e2b58b4615d794ff709 (patch) | |
tree | 6718352d2d32505f6782c26348edec739aeaa0f9 /apps/gui/skin_engine/skin_display.c | |
parent | 13da1ba785b1f06bacae06da422ac2cf2ea5eb76 (diff) | |
download | rockbox-14fbefdf390d397a13b31e2b58b4615d794ff709.tar.gz rockbox-14fbefdf390d397a13b31e2b58b4615d794ff709.zip |
Move skin global state to the WPS
This state is actually specific to the WPS and it makes more
sense to put it there.
Change-Id: I5dfee237fdcbae944806501ff3127a930820d68a
Diffstat (limited to 'apps/gui/skin_engine/skin_display.c')
-rw-r--r-- | apps/gui/skin_engine/skin_display.c | 6 |
1 files changed, 3 insertions, 3 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 @@ | |||
65 | #endif | 65 | #endif |
66 | #include "root_menu.h" | 66 | #include "root_menu.h" |
67 | 67 | ||
68 | 68 | #include "wps.h" | |
69 | #include "wps_internals.h" | 69 | #include "wps_internals.h" |
70 | #include "skin_engine.h" | 70 | #include "skin_engine.h" |
71 | #include "statusbar-skinned.h" | 71 | #include "statusbar-skinned.h" |
@@ -83,7 +83,7 @@ void skin_update(enum skinnable_screens skin, enum screen_type screen, | |||
83 | struct gui_wps *gwps = skin_get_gwps(skin, screen); | 83 | struct gui_wps *gwps = skin_get_gwps(skin, screen); |
84 | /* This maybe shouldnt be here, | 84 | /* This maybe shouldnt be here, |
85 | * This is also safe for skined screen which dont use the id3 */ | 85 | * This is also safe for skined screen which dont use the id3 */ |
86 | struct mp3entry *id3 = skin_get_global_state()->id3; | 86 | struct mp3entry *id3 = get_wps_state()->id3; |
87 | bool cuesheet_update = (id3 != NULL ? cuesheet_subtrack_changed(id3) : false); | 87 | bool cuesheet_update = (id3 != NULL ? cuesheet_subtrack_changed(id3) : false); |
88 | if (cuesheet_update) | 88 | if (cuesheet_update) |
89 | skin_request_full_update(skin); | 89 | skin_request_full_update(skin); |
@@ -162,7 +162,7 @@ void draw_progressbar(struct gui_wps *gwps, int line, struct progressbar *pb) | |||
162 | { | 162 | { |
163 | struct screen *display = gwps->display; | 163 | struct screen *display = gwps->display; |
164 | struct viewport *vp = SKINOFFSETTOPTR(get_skin_buffer(gwps->data), pb->vp); | 164 | struct viewport *vp = SKINOFFSETTOPTR(get_skin_buffer(gwps->data), pb->vp); |
165 | struct wps_state *state = skin_get_global_state(); | 165 | struct wps_state *state = get_wps_state(); |
166 | struct mp3entry *id3 = state->id3; | 166 | struct mp3entry *id3 = state->id3; |
167 | int x = pb->x, y = pb->y, width = pb->width, height = pb->height; | 167 | int x = pb->x, y = pb->y, width = pb->width, height = pb->height; |
168 | unsigned long length, end; | 168 | unsigned long length, end; |