diff options
Diffstat (limited to 'apps/gui')
| -rw-r--r-- | apps/gui/skin_engine/skin_display.c | 11 | ||||
| -rw-r--r-- | apps/gui/skin_engine/skin_tokens.c | 14 |
2 files changed, 21 insertions, 4 deletions
diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c index f7bc14db20..5c2b11866a 100644 --- a/apps/gui/skin_engine/skin_display.c +++ b/apps/gui/skin_engine/skin_display.c @@ -443,8 +443,15 @@ static void wps_display_images(struct gui_wps *gwps, struct viewport* vp) if (data->albumart && data->albumart->vp == vp && data->albumart->draw) { - draw_album_art(gwps, playback_current_aa_hid(data->playback_aa_slot), - false); + int handle = playback_current_aa_hid(data->playback_aa_slot); +#if CONFIG_TUNER + if (in_radio_screen()) + { + struct dim dim = {data->albumart->width, data->albumart->height}; + handle = radio_get_art_hid(&dim); + } +#endif + draw_album_art(gwps, handle, false); data->albumart->draw = false; } #endif diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c index 3d944a5315..538f385e44 100644 --- a/apps/gui/skin_engine/skin_tokens.c +++ b/apps/gui/skin_engine/skin_tokens.c @@ -577,8 +577,18 @@ const char *get_token_value(struct gui_wps *gwps, return buf; #ifdef HAVE_ALBUMART case WPS_TOKEN_ALBUMART_FOUND: - if (data->albumart) { - if (playback_current_aa_hid(data->playback_aa_slot) >= 0) + if (data->albumart) + { + int handle = -1; + handle = playback_current_aa_hid(data->playback_aa_slot); +#if CONFIG_TUNER + if (in_radio_screen() || (get_radio_status() != FMRADIO_OFF)) + { + struct dim dim = {data->albumart->width, data->albumart->height}; + handle = radio_get_art_hid(&dim); + } +#endif + if (handle >= 0) return "C"; } return NULL; |