diff options
-rw-r--r-- | apps/gui/skin_engine/skin_display.c | 3 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 8 | ||||
-rw-r--r-- | apps/gui/skin_engine/wps_internals.h | 1 |
3 files changed, 1 insertions, 11 deletions
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) | |||
413 | #ifdef HAVE_ALBUMART | 413 | #ifdef HAVE_ALBUMART |
414 | /* now draw the AA */ | 414 | /* now draw the AA */ |
415 | struct skin_albumart *aa = SKINOFFSETTOPTR(get_skin_buffer(data), data->albumart); | 415 | struct skin_albumart *aa = SKINOFFSETTOPTR(get_skin_buffer(data), data->albumart); |
416 | if (aa && SKINOFFSETTOPTR(get_skin_buffer(data), aa->vp) == vp | 416 | if (aa && aa->draw_handle >= 0) |
417 | && aa->draw_handle >= 0) | ||
418 | { | 417 | { |
419 | draw_album_art(gwps, aa->draw_handle, false); | 418 | draw_album_art(gwps, aa->draw_handle, false); |
420 | aa->draw_handle = -1; | 419 | 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, | |||
1317 | if (!isdefault(param3) && param3->type == PERCENT) | 1317 | if (!isdefault(param3) && param3->type == PERCENT) |
1318 | aa->height = param3->data.number * curr_vp->vp.height / 1000; | 1318 | aa->height = param3->data.number * curr_vp->vp.height / 1000; |
1319 | 1319 | ||
1320 | aa->vp = PTRTOSKINOFFSET(skin_buffer, &curr_vp->vp); | ||
1321 | aa->draw_handle = -1; | 1320 | aa->draw_handle = -1; |
1322 | 1321 | ||
1323 | /* if we got here, we parsed everything ok .. ! */ | 1322 | /* if we got here, we parsed everything ok .. ! */ |
@@ -2405,13 +2404,6 @@ static int skin_element_callback(struct skin_element* element, void* data) | |||
2405 | break; | 2404 | break; |
2406 | #endif | 2405 | #endif |
2407 | #ifdef HAVE_ALBUMART | 2406 | #ifdef HAVE_ALBUMART |
2408 | case SKIN_TOKEN_ALBUMART_DISPLAY: | ||
2409 | if (SKINOFFSETTOPTR(skin_buffer, wps_data->albumart)) | ||
2410 | { | ||
2411 | struct skin_albumart *aa = SKINOFFSETTOPTR(skin_buffer, wps_data->albumart); | ||
2412 | aa->vp = PTRTOSKINOFFSET(skin_buffer, &curr_vp->vp); | ||
2413 | } | ||
2414 | break; | ||
2415 | case SKIN_TOKEN_ALBUMART_LOAD: | 2407 | case SKIN_TOKEN_ALBUMART_LOAD: |
2416 | function = parse_albumart_load; | 2408 | function = parse_albumart_load; |
2417 | break; | 2409 | 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 { | |||
272 | unsigned char yalign; /* WPS_ALBUMART_ALIGN_TOP, _CENTER, _BOTTOM */ | 272 | unsigned char yalign; /* WPS_ALBUMART_ALIGN_TOP, _CENTER, _BOTTOM */ |
273 | unsigned char state; /* WPS_ALBUMART_NONE, _CHECK, _LOAD */ | 273 | unsigned char state; /* WPS_ALBUMART_NONE, _CHECK, _LOAD */ |
274 | 274 | ||
275 | OFFSETTYPE(struct viewport *) vp; | ||
276 | int draw_handle; | 275 | int draw_handle; |
277 | }; | 276 | }; |
278 | #endif | 277 | #endif |