diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c index 2affd23c87..43337049fd 100644 --- a/apps/gui/skin_engine/skin_display.c +++ b/apps/gui/skin_engine/skin_display.c @@ -413,8 +413,7 @@ void wps_display_images(struct gui_wps *gwps, struct viewport* vp) #ifdef HAVE_ALBUMART /* now draw the AA */ struct skin_albumart *aa = SKINOFFSETTOPTR(get_skin_buffer(data), data->albumart); - if (aa && SKINOFFSETTOPTR(get_skin_buffer(data), aa->vp) == vp - && aa->draw_handle >= 0) + if (aa && aa->draw_handle >= 0) { draw_album_art(gwps, aa->draw_handle, false); aa->draw_handle = -1; diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index 9fb15d8e56..3e91536411 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c @@ -1317,7 +1317,6 @@ static int parse_albumart_load(struct skin_element* element, if (!isdefault(param3) && param3->type == PERCENT) aa->height = param3->data.number * curr_vp->vp.height / 1000; - aa->vp = PTRTOSKINOFFSET(skin_buffer, &curr_vp->vp); aa->draw_handle = -1; /* if we got here, we parsed everything ok .. ! */ @@ -2405,13 +2404,6 @@ static int skin_element_callback(struct skin_element* element, void* data) break; #endif #ifdef HAVE_ALBUMART - case SKIN_TOKEN_ALBUMART_DISPLAY: - if (SKINOFFSETTOPTR(skin_buffer, wps_data->albumart)) - { - struct skin_albumart *aa = SKINOFFSETTOPTR(skin_buffer, wps_data->albumart); - aa->vp = PTRTOSKINOFFSET(skin_buffer, &curr_vp->vp); - } - break; case SKIN_TOKEN_ALBUMART_LOAD: function = parse_albumart_load; break; diff --git a/apps/gui/skin_engine/wps_internals.h b/apps/gui/skin_engine/wps_internals.h index f2988512d9..6a5d3c27f9 100644 --- a/apps/gui/skin_engine/wps_internals.h +++ b/apps/gui/skin_engine/wps_internals.h @@ -272,7 +272,6 @@ struct skin_albumart { unsigned char yalign; /* WPS_ALBUMART_ALIGN_TOP, _CENTER, _BOTTOM */ unsigned char state; /* WPS_ALBUMART_NONE, _CHECK, _LOAD */ - OFFSETTYPE(struct viewport *) vp; int draw_handle; }; #endif