From fe2f042670a59cf73c3775945df9185d933ca9b4 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Mon, 7 Sep 2009 02:36:56 +0000 Subject: rework AA load/display handling in the skins to get them working in viewports again git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22646 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/wps.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'apps/gui/wps.c') diff --git a/apps/gui/wps.c b/apps/gui/wps.c index f336f77503..dcd3e2480d 100644 --- a/apps/gui/wps.c +++ b/apps/gui/wps.c @@ -1280,7 +1280,7 @@ void gui_sync_wps_init(void) { skin_data_init(&wps_datas[i]); #ifdef HAVE_ALBUMART - wps_datas[i].wps_uses_albumart = 0; + wps_datas[i].albumart = NULL; #endif #ifdef HAVE_REMOTE_LCD wps_datas[i].remote_wps = (i == SCREEN_REMOTE); @@ -1306,12 +1306,13 @@ bool wps_uses_albumart(int *width, int *height) int i; FOR_NB_SCREENS(i) { struct gui_wps *gwps = &gui_wps[i]; - if (gwps->data && (gwps->data->wps_uses_albumart != WPS_ALBUMART_NONE)) + struct skin_albumart *aa = gwps->data->albumart; + if (aa && (aa->wps_uses_albumart != WPS_ALBUMART_NONE)) { if (width) - *width = gui_wps[0].data->albumart_max_width; + *width = aa->albumart_max_width; if (height) - *height = gui_wps[0].data->albumart_max_height; + *height = aa->albumart_max_height; return true; } } -- cgit v1.2.3