summaryrefslogtreecommitdiff
path: root/apps/gui/skin_engine
diff options
context:
space:
mode:
Diffstat (limited to 'apps/gui/skin_engine')
-rw-r--r--apps/gui/skin_engine/skin_backdrops.c3
-rw-r--r--apps/gui/skin_engine/skin_engine.c4
-rw-r--r--apps/gui/skin_engine/skin_parser.c4
-rw-r--r--apps/gui/skin_engine/wps_internals.h2
4 files changed, 6 insertions, 7 deletions
diff --git a/apps/gui/skin_engine/skin_backdrops.c b/apps/gui/skin_engine/skin_backdrops.c
index 4663a8756f..0b67125bbf 100644
--- a/apps/gui/skin_engine/skin_backdrops.c
+++ b/apps/gui/skin_engine/skin_backdrops.c
@@ -28,8 +28,7 @@
28#include "wps_internals.h" 28#include "wps_internals.h"
29#include "skin_engine.h" 29#include "skin_engine.h"
30 30
31#if !defined(__PCTOOL__) && \ 31#if !defined(__PCTOOL__) && defined(HAVE_BACKDROP_IMAGE)
32 ((LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1)))
33 32
34#define NB_BDROPS SKINNABLE_SCREENS_COUNT*NB_SCREENS 33#define NB_BDROPS SKINNABLE_SCREENS_COUNT*NB_SCREENS
35static struct skin_backdrop { 34static struct skin_backdrop {
diff --git a/apps/gui/skin_engine/skin_engine.c b/apps/gui/skin_engine/skin_engine.c
index 75862faab0..c6791cac09 100644
--- a/apps/gui/skin_engine/skin_engine.c
+++ b/apps/gui/skin_engine/skin_engine.c
@@ -133,11 +133,11 @@ void settings_apply_skins(void)
133 FOR_NB_SCREENS(j) 133 FOR_NB_SCREENS(j)
134 skin_get_gwps(i, j); 134 skin_get_gwps(i, j);
135 } 135 }
136#if LCD_DEPTH > 1 || defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 136#ifdef HAVE_BACKDROP_IMAGE
137 skin_backdrops_preload(); /* should maybe check the retval here... */ 137 skin_backdrops_preload(); /* should maybe check the retval here... */
138#endif 138#endif
139 viewportmanager_theme_changed(THEME_STATUSBAR); 139 viewportmanager_theme_changed(THEME_STATUSBAR);
140#if LCD_DEPTH > 1 || defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 140#ifdef HAVE_BACKDROP_IMAGE
141 FOR_NB_SCREENS(i) 141 FOR_NB_SCREENS(i)
142 skin_backdrop_show(sb_get_backdrop(i)); 142 skin_backdrop_show(sb_get_backdrop(i));
143#endif 143#endif
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index 33561bfed4..ad10689107 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -1537,7 +1537,7 @@ static void skin_data_reset(struct wps_data *wps_data)
1537 wps_data->images = INVALID_OFFSET; 1537 wps_data->images = INVALID_OFFSET;
1538#endif 1538#endif
1539 wps_data->tree = INVALID_OFFSET; 1539 wps_data->tree = INVALID_OFFSET;
1540#if LCD_DEPTH > 1 || defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 1540#ifdef HAVE_BACKDROP_IMAGE
1541 if (wps_data->backdrop_id >= 0) 1541 if (wps_data->backdrop_id >= 0)
1542 skin_backdrop_unload(wps_data->backdrop_id); 1542 skin_backdrop_unload(wps_data->backdrop_id);
1543 backdrop_filename = NULL; 1543 backdrop_filename = NULL;
@@ -2202,7 +2202,7 @@ bool skin_data_load(enum screen_type screen, struct wps_data *wps_data,
2202 } 2202 }
2203 skin_buffer = (void *)(((unsigned long)skin_buffer + 3) & ~3); 2203 skin_buffer = (void *)(((unsigned long)skin_buffer + 3) & ~3);
2204 buffersize -= 3; 2204 buffersize -= 3;
2205#if LCD_DEPTH > 1 || defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 2205#ifdef HAVE_BACKDROP_IMAGE
2206 backdrop_filename = "-"; 2206 backdrop_filename = "-";
2207 wps_data->backdrop_id = -1; 2207 wps_data->backdrop_id = -1;
2208#endif 2208#endif
diff --git a/apps/gui/skin_engine/wps_internals.h b/apps/gui/skin_engine/wps_internals.h
index 65a063592f..9c3fa1b5bc 100644
--- a/apps/gui/skin_engine/wps_internals.h
+++ b/apps/gui/skin_engine/wps_internals.h
@@ -325,7 +325,7 @@ struct wps_data
325 OFFSETTYPE(int *) font_ids; 325 OFFSETTYPE(int *) font_ids;
326 int font_count; 326 int font_count;
327#endif 327#endif
328#if LCD_DEPTH > 1 || defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 328#ifdef HAVE_BACKDROP_IMAGE
329 int backdrop_id; 329 int backdrop_id;
330#endif 330#endif
331 331