From 0f0d9064c5e7add982d4b62850375985d79c1168 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Wed, 14 Oct 2009 15:49:11 +0000 Subject: Remove wps_reset(), and rename skin_data_init to skin_data_reset() and extend it to zero most of the wps_data members. As these are called when parsing a skin it doesn't need to be called by the wps or settings, so make it local to skin_parser.c. Reorder the members of struct wps_data for more effecient alignment. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23171 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/skin_engine/wps_internals.h | 43 ++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 24 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 177a376008..7a4fdddc7c 100644 --- a/apps/gui/skin_engine/wps_internals.h +++ b/apps/gui/skin_engine/wps_internals.h @@ -244,43 +244,38 @@ struct skin_albumart { struct wps_data { #ifdef HAVE_LCD_BITMAP - bool wps_sb_tag; - bool show_sb_on_wps; - struct skin_token_list *images; struct skin_token_list *progressbars; - - bool peak_meter_enabled; -#ifdef HAVE_ALBUMART - struct skin_albumart *albumart; -#endif - -#else /*HAVE_LCD_CHARCELLS */ - unsigned short wps_progress_pat[8]; - bool full_line_progressbar; #endif #ifdef HAVE_TOUCHSCREEN struct skin_token_list *touchregions; #endif - -#ifdef HAVE_REMOTE_LCD - bool remote_wps; -#endif - struct skin_token_list *viewports; - + struct skin_token_list *strings; +#ifdef HAVE_ALBUMART + struct skin_albumart *albumart; +#endif + struct wps_token *tokens; /* Total number of tokens in the WPS. During WPS parsing, this is the index of the token being parsed. */ int num_tokens; - struct wps_token *tokens; - - struct skin_token_list *strings; - - bool wps_loaded; - /* tick the volume button was last pressed */ unsigned int button_time_volume; + +#ifdef HAVE_LCD_BITMAP + bool peak_meter_enabled; + bool wps_sb_tag; + bool show_sb_on_wps; +#else /*HAVE_LCD_CHARCELLS */ + unsigned short wps_progress_pat[8]; + bool full_line_progressbar; +#endif + bool wps_loaded; +#ifdef HAVE_REMOTE_LCD + /* this must not be reset on skin loading */ + bool remote_wps; +#endif }; /* wps_data end */ -- cgit v1.2.3