From 14fbefdf390d397a13b31e2b58b4615d794ff709 Mon Sep 17 00:00:00 2001 From: Aidan MacDonald Date: Sun, 2 Oct 2022 21:05:32 +0100 Subject: 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 --- apps/gui/skin_engine/skin_display.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'apps/gui/skin_engine/skin_display.c') 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; -- cgit v1.2.3