diff options
-rw-r--r-- | apps/gui/skin_engine/skin_display.c | 15 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_tokens.c | 1 |
2 files changed, 8 insertions, 8 deletions
diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c index e24ab66393..762b7f78a6 100644 --- a/apps/gui/skin_engine/skin_display.c +++ b/apps/gui/skin_engine/skin_display.c | |||
@@ -475,13 +475,6 @@ static bool evaluate_conditional(struct gui_wps *gwps, int *token_index) | |||
475 | if (data->tokens[i].type == WPS_TOKEN_IMAGE_PRELOAD_DISPLAY) | 475 | if (data->tokens[i].type == WPS_TOKEN_IMAGE_PRELOAD_DISPLAY) |
476 | clear_image_pos(gwps, find_image(data->tokens[i].value.i&0xFF, gwps->data)); | 476 | clear_image_pos(gwps, find_image(data->tokens[i].value.i&0xFF, gwps->data)); |
477 | #endif | 477 | #endif |
478 | #ifdef HAVE_ALBUMART | ||
479 | if (data->albumart && data->tokens[i].type == WPS_TOKEN_ALBUMART_DISPLAY) | ||
480 | { | ||
481 | draw_album_art(gwps, audio_current_aa_hid(), true); | ||
482 | data->albumart->draw = false; | ||
483 | } | ||
484 | #endif | ||
485 | } | 478 | } |
486 | 479 | ||
487 | return true; | 480 | return true; |
@@ -629,6 +622,14 @@ static bool get_line(struct gui_wps *gwps, | |||
629 | } | 622 | } |
630 | } | 623 | } |
631 | break; | 624 | break; |
625 | #ifdef HAVE_ALBUMART | ||
626 | case WPS_TOKEN_ALBUMART_DISPLAY: | ||
627 | if (data->albumart) | ||
628 | { | ||
629 | data->albumart->draw = true; | ||
630 | } | ||
631 | break; | ||
632 | #endif | ||
632 | default: | 633 | default: |
633 | { | 634 | { |
634 | /* get the value of the tag and copy it to the buffer */ | 635 | /* get the value of the tag and copy it to the buffer */ |
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c index 7f83da0451..6d4fef5ab5 100644 --- a/apps/gui/skin_engine/skin_tokens.c +++ b/apps/gui/skin_engine/skin_tokens.c | |||
@@ -322,7 +322,6 @@ const char *get_token_value(struct gui_wps *gwps, | |||
322 | if (!data->albumart) | 322 | if (!data->albumart) |
323 | return NULL; | 323 | return NULL; |
324 | if (audio_current_aa_hid() >= 0) { | 324 | if (audio_current_aa_hid() >= 0) { |
325 | data->albumart->draw = true; | ||
326 | return "C"; | 325 | return "C"; |
327 | } | 326 | } |
328 | data->albumart->draw = false; | 327 | data->albumart->draw = false; |