diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2009-09-07 02:36:56 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2009-09-07 02:36:56 +0000 |
commit | fe2f042670a59cf73c3775945df9185d933ca9b4 (patch) | |
tree | cbb5efd5f4cad7fd524a43d304e1dbeeddc2cdb1 /apps/gui/wps.c | |
parent | 8898339fcf07aee644ebcabe77d5a2dd323642ed (diff) | |
download | rockbox-fe2f042670a59cf73c3775945df9185d933ca9b4.tar.gz rockbox-fe2f042670a59cf73c3775945df9185d933ca9b4.zip |
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
Diffstat (limited to 'apps/gui/wps.c')
-rw-r--r-- | apps/gui/wps.c | 9 |
1 files changed, 5 insertions, 4 deletions
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) | |||
1280 | { | 1280 | { |
1281 | skin_data_init(&wps_datas[i]); | 1281 | skin_data_init(&wps_datas[i]); |
1282 | #ifdef HAVE_ALBUMART | 1282 | #ifdef HAVE_ALBUMART |
1283 | wps_datas[i].wps_uses_albumart = 0; | 1283 | wps_datas[i].albumart = NULL; |
1284 | #endif | 1284 | #endif |
1285 | #ifdef HAVE_REMOTE_LCD | 1285 | #ifdef HAVE_REMOTE_LCD |
1286 | wps_datas[i].remote_wps = (i == SCREEN_REMOTE); | 1286 | wps_datas[i].remote_wps = (i == SCREEN_REMOTE); |
@@ -1306,12 +1306,13 @@ bool wps_uses_albumart(int *width, int *height) | |||
1306 | int i; | 1306 | int i; |
1307 | FOR_NB_SCREENS(i) { | 1307 | FOR_NB_SCREENS(i) { |
1308 | struct gui_wps *gwps = &gui_wps[i]; | 1308 | struct gui_wps *gwps = &gui_wps[i]; |
1309 | if (gwps->data && (gwps->data->wps_uses_albumart != WPS_ALBUMART_NONE)) | 1309 | struct skin_albumart *aa = gwps->data->albumart; |
1310 | if (aa && (aa->wps_uses_albumart != WPS_ALBUMART_NONE)) | ||
1310 | { | 1311 | { |
1311 | if (width) | 1312 | if (width) |
1312 | *width = gui_wps[0].data->albumart_max_width; | 1313 | *width = aa->albumart_max_width; |
1313 | if (height) | 1314 | if (height) |
1314 | *height = gui_wps[0].data->albumart_max_height; | 1315 | *height = aa->albumart_max_height; |
1315 | return true; | 1316 | return true; |
1316 | } | 1317 | } |
1317 | } | 1318 | } |