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/skin_display.c | 25 ------------------------- 1 file changed, 25 deletions(-) (limited to 'apps/gui/skin_engine/skin_display.c') diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c index cf1dbaa771..7d75b48506 100644 --- a/apps/gui/skin_engine/skin_display.c +++ b/apps/gui/skin_engine/skin_display.c @@ -68,31 +68,6 @@ static bool skin_redraw(struct gui_wps *gwps, unsigned refresh_mode); -/* initial setup of wps_data */ -void skin_data_init(struct wps_data *wps_data) -{ -#ifdef HAVE_LCD_BITMAP - wps_data->wps_sb_tag = false; - wps_data->show_sb_on_wps = false; - wps_data->peak_meter_enabled = false; - wps_data->images = NULL; - wps_data->progressbars = NULL; -#ifdef HAVE_ALBUMART - wps_data->albumart = NULL; -#endif - /* progress bars */ -#else /* HAVE_LCD_CHARCELLS */ - int i; - for (i = 0; i < 8; i++) - { - wps_data->wps_progress_pat[i] = 0; - } - wps_data->full_line_progressbar = false; -#endif - wps_data->button_time_volume = 0; - wps_data->wps_loaded = false; -} - /* TODO: maybe move this whole function into wps.c instead ? */ bool gui_wps_display(struct gui_wps *gwps) { -- cgit v1.2.3