From eee5423fe10f247f74d69404924edf3a0d54e8cd Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Fri, 29 Jan 2010 07:52:13 +0000 Subject: skin rework (FS#10922) notable changes: - simplify the setting/skin relationship. settings are used as the fallback if it's not specified in the skin - backdrop buffers are now in the skin buffer (which has also increased slightly to accomodate 1 backdrop for each skin and 2 full colour screens for bmps (up for 1.5)) - if no %X is specified in a skin then the backdrop setting will be used. use %Xd to explicitly disable a skin from displaying a backdrop - the base skin can now specify a backdrop. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24366 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/backdrop.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'apps/gui/backdrop.h') diff --git a/apps/gui/backdrop.h b/apps/gui/backdrop.h index 3b873fd137..735a884606 100644 --- a/apps/gui/backdrop.h +++ b/apps/gui/backdrop.h @@ -22,29 +22,29 @@ #ifndef _BACKDROP_H #define _BACKDROP_H -enum backdrop_type { - BACKDROP_MAIN, - BACKDROP_SKIN_WPS, -}; - #if LCD_DEPTH > 1 && !defined(__PCTOOL__) #include "lcd.h" #include "bmp.h" -bool backdrop_load(enum backdrop_type bdrop, const char*); -void backdrop_unload(enum backdrop_type bdrop); -void backdrop_show(enum backdrop_type bdrop); -void backdrop_hide(void); +#define LCD_BACKDROP_BYTES (LCD_FBHEIGHT*LCD_FBWIDTH*sizeof(fb_data)) +#if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 +#define REMOTE_LCD_BACKDROP_BYTES \ + (LCD_REMOTE_FBHEIGHT*LCD_REMOTE_FBWIDTH*sizeof(fb_remote_data)) +#else +#define REMOTE_LCD_BACKDROP_BYTES 0 +#endif + +bool backdrop_load(const char *filename, char* backdrop_buffer); +void backdrop_show(char* backdrop_buffer); +#else +#define LCD_BACKDROP_BYTES 0 #endif #if defined(HAVE_REMOTE_LCD) -/* no main backdrop, stubs! */ -bool remote_backdrop_load(enum backdrop_type bdrop,const char* filename); -void remote_backdrop_unload(enum backdrop_type bdrop); -void remote_backdrop_show(enum backdrop_type bdrop); -void remote_backdrop_hide(void); +bool remote_backdrop_load(const char *filename, char* backdrop_buffer); +void remote_backdrop_show(char* backdrop_buffer); #endif #endif /* _BACKDROP_H */ -- cgit v1.2.3