diff options
Diffstat (limited to 'apps/gui/skin_engine/skin_engine.c')
-rw-r--r-- | apps/gui/skin_engine/skin_engine.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/apps/gui/skin_engine/skin_engine.c b/apps/gui/skin_engine/skin_engine.c index ec4e1fd073..cd763def1c 100644 --- a/apps/gui/skin_engine/skin_engine.c +++ b/apps/gui/skin_engine/skin_engine.c | |||
@@ -56,9 +56,7 @@ static struct gui_skin_helper { | |||
56 | char* (*default_skin)(enum screen_type screen); | 56 | char* (*default_skin)(enum screen_type screen); |
57 | bool load_on_boot; | 57 | bool load_on_boot; |
58 | } skin_helpers[SKINNABLE_SCREENS_COUNT] = { | 58 | } skin_helpers[SKINNABLE_SCREENS_COUNT] = { |
59 | #ifdef HAVE_LCD_BITMAP | ||
60 | [CUSTOM_STATUSBAR] = { sb_preproccess, sb_postproccess, sb_create_from_settings, true }, | 59 | [CUSTOM_STATUSBAR] = { sb_preproccess, sb_postproccess, sb_create_from_settings, true }, |
61 | #endif | ||
62 | [WPS] = { NULL, NULL, wps_default_skin, true }, | 60 | [WPS] = { NULL, NULL, wps_default_skin, true }, |
63 | #if CONFIG_TUNER | 61 | #if CONFIG_TUNER |
64 | [FM_SCREEN] = { NULL, NULL, default_radio_skin, false } | 62 | [FM_SCREEN] = { NULL, NULL, default_radio_skin, false } |
@@ -115,10 +113,8 @@ static void gui_skin_reset(struct gui_skin *skin) | |||
115 | #ifdef HAVE_SKIN_VARIABLES | 113 | #ifdef HAVE_SKIN_VARIABLES |
116 | skin->data.skinvars = -1; | 114 | skin->data.skinvars = -1; |
117 | #endif | 115 | #endif |
118 | #ifdef HAVE_LCD_BITMAP | ||
119 | skin->data.font_ids = -1; | 116 | skin->data.font_ids = -1; |
120 | skin->data.images = -1; | 117 | skin->data.images = -1; |
121 | #endif | ||
122 | #ifdef HAVE_ALBUMART | 118 | #ifdef HAVE_ALBUMART |
123 | skin->data.albumart = -1; | 119 | skin->data.albumart = -1; |
124 | skin->data.playback_aa_slot = -1; | 120 | skin->data.playback_aa_slot = -1; |
@@ -157,9 +153,7 @@ void settings_apply_skins(void) | |||
157 | char filename[MAX_PATH]; | 153 | char filename[MAX_PATH]; |
158 | static bool first_run = true; | 154 | static bool first_run = true; |
159 | 155 | ||
160 | #ifdef HAVE_LCD_BITMAP | ||
161 | skin_backdrop_init(); | 156 | skin_backdrop_init(); |
162 | #endif | ||
163 | skins_initialised = true; | 157 | skins_initialised = true; |
164 | 158 | ||
165 | /* Make sure each skin is loaded */ | 159 | /* Make sure each skin is loaded */ |
@@ -236,7 +230,6 @@ static char* get_skin_filename(char *buf, size_t buf_size, | |||
236 | char *setting = NULL, *ext = NULL; | 230 | char *setting = NULL, *ext = NULL; |
237 | switch (skin) | 231 | switch (skin) |
238 | { | 232 | { |
239 | #ifdef HAVE_LCD_BITMAP | ||
240 | case CUSTOM_STATUSBAR: | 233 | case CUSTOM_STATUSBAR: |
241 | #if defined(HAVE_REMOTE_LCD) && NB_SCREENS > 1 | 234 | #if defined(HAVE_REMOTE_LCD) && NB_SCREENS > 1 |
242 | if (screen == SCREEN_REMOTE) | 235 | if (screen == SCREEN_REMOTE) |
@@ -251,7 +244,6 @@ static char* get_skin_filename(char *buf, size_t buf_size, | |||
251 | ext = "sbs"; | 244 | ext = "sbs"; |
252 | } | 245 | } |
253 | break; | 246 | break; |
254 | #endif | ||
255 | case WPS: | 247 | case WPS: |
256 | #if defined(HAVE_REMOTE_LCD) && NB_SCREENS > 1 | 248 | #if defined(HAVE_REMOTE_LCD) && NB_SCREENS > 1 |
257 | if (screen == SCREEN_REMOTE) | 249 | if (screen == SCREEN_REMOTE) |
@@ -296,10 +288,8 @@ static char* get_skin_filename(char *buf, size_t buf_size, | |||
296 | 288 | ||
297 | struct gui_wps *skin_get_gwps(enum skinnable_screens skin, enum screen_type screen) | 289 | struct gui_wps *skin_get_gwps(enum skinnable_screens skin, enum screen_type screen) |
298 | { | 290 | { |
299 | #ifdef HAVE_LCD_BITMAP | ||
300 | if (skin == CUSTOM_STATUSBAR && !skins_initialised) | 291 | if (skin == CUSTOM_STATUSBAR && !skins_initialised) |
301 | return &skins[skin][screen].gui_wps; | 292 | return &skins[skin][screen].gui_wps; |
302 | #endif | ||
303 | 293 | ||
304 | if (skins[skin][screen].data.wps_loaded == false) | 294 | if (skins[skin][screen].data.wps_loaded == false) |
305 | { | 295 | { |