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/skin_engine/wps_internals.h | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) (limited to 'apps/gui/skin_engine/wps_internals.h') diff --git a/apps/gui/skin_engine/wps_internals.h b/apps/gui/skin_engine/wps_internals.h index d1674ac88e..e2330a777e 100644 --- a/apps/gui/skin_engine/wps_internals.h +++ b/apps/gui/skin_engine/wps_internals.h @@ -220,6 +220,24 @@ struct touchregion { int action; /* action this button will return */ }; #endif + + +#ifdef HAVE_ALBUMART +struct skin_albumart { + /* Album art support */ + struct viewport *vp;/* The viewport this is in */ + unsigned char wps_uses_albumart; /* WPS_ALBUMART_NONE, _CHECK, _LOAD */ + short albumart_x; + short albumart_y; + unsigned char albumart_xalign; /* WPS_ALBUMART_ALIGN_LEFT, _CENTER, _RIGHT */ + unsigned char albumart_yalign; /* WPS_ALBUMART_ALIGN_TOP, _CENTER, _BOTTOM */ + short albumart_max_width; + short albumart_max_height; + + bool draw; +}; +#endif + /* wps_data this struct holds all necessary data which describes the viewable content of a wps */ @@ -233,18 +251,8 @@ struct wps_data struct skin_token_list *progressbars; bool peak_meter_enabled; - #ifdef HAVE_ALBUMART - /* Album art support */ - unsigned char wps_uses_albumart; /* WPS_ALBUMART_NONE, _CHECK, _LOAD */ - short albumart_x; - short albumart_y; - unsigned char albumart_xalign; /* WPS_ALBUMART_ALIGN_LEFT, _CENTER, _RIGHT */ - unsigned char albumart_yalign; /* WPS_ALBUMART_ALIGN_TOP, _CENTER, _BOTTOM */ - short albumart_max_width; - short albumart_max_height; - - int albumart_cond_index; + struct skin_albumart *albumart; #endif #else /*HAVE_LCD_CHARCELLS */ -- cgit v1.2.3