diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2011-11-19 13:46:25 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2011-11-19 13:46:25 +0000 |
commit | 1252d0d54084a17255d2fad57a462cd15479561b (patch) | |
tree | abb5e6a523fde1a44b2d41c5bf564e25286d4dc5 | |
parent | 852b68c74aab63915ba9c9c7378cf33e3277e6bb (diff) | |
download | rockbox-1252d0d54084a17255d2fad57a462cd15479561b.tar.gz rockbox-1252d0d54084a17255d2fad57a462cd15479561b.zip |
Get rid of a really annoying #ifdef line to check if backdrop support should be enabled
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31027 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/gui/skin_engine/skin_backdrops.c | 3 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_engine.c | 4 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 4 | ||||
-rw-r--r-- | apps/gui/skin_engine/wps_internals.h | 2 | ||||
-rw-r--r-- | apps/gui/viewport.c | 2 | ||||
-rw-r--r-- | apps/gui/wps.c | 4 | ||||
-rw-r--r-- | apps/menus/theme_menu.c | 4 | ||||
-rw-r--r-- | apps/radio/radio_skin.c | 4 | ||||
-rw-r--r-- | firmware/export/config.h | 4 |
9 files changed, 17 insertions, 14 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 |
35 | static struct skin_backdrop { | 34 | static 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 | ||
diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c index 940f7f9cfa..a55ccc3221 100644 --- a/apps/gui/viewport.c +++ b/apps/gui/viewport.c | |||
@@ -117,7 +117,7 @@ static void toggle_theme(enum screen_type screen, bool force) | |||
117 | bool first_boot = theme_stack_top[screen] == 0; | 117 | bool first_boot = theme_stack_top[screen] == 0; |
118 | /* remove the left overs from the previous screen. | 118 | /* remove the left overs from the previous screen. |
119 | * could cause a tiny flicker. Redo your screen code if that happens */ | 119 | * could cause a tiny flicker. Redo your screen code if that happens */ |
120 | #if LCD_DEPTH > 1 || defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 | 120 | #ifdef HAVE_BACKDROP_IMAGE |
121 | skin_backdrop_show(sb_get_backdrop(screen)); | 121 | skin_backdrop_show(sb_get_backdrop(screen)); |
122 | #endif | 122 | #endif |
123 | if (LIKELY(after_boot[screen]) && (!was_enabled[screen] || force)) | 123 | if (LIKELY(after_boot[screen]) && (!was_enabled[screen] || force)) |
diff --git a/apps/gui/wps.c b/apps/gui/wps.c index 97c945d0e8..284aa57a3e 100644 --- a/apps/gui/wps.c +++ b/apps/gui/wps.c | |||
@@ -631,7 +631,7 @@ static void gwps_leave_wps(void) | |||
631 | FOR_NB_SCREENS(i) | 631 | FOR_NB_SCREENS(i) |
632 | { | 632 | { |
633 | skin_get_gwps(WPS, i)->display->stop_scroll(); | 633 | skin_get_gwps(WPS, i)->display->stop_scroll(); |
634 | #if LCD_DEPTH > 1 || defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 | 634 | #ifdef HAVE_BACKDROP_IMAGE |
635 | skin_backdrop_show(sb_get_backdrop(i)); | 635 | skin_backdrop_show(sb_get_backdrop(i)); |
636 | #endif | 636 | #endif |
637 | viewportmanager_theme_undo(i, skin_has_sbs(i, skin_get_gwps(WPS, i)->data)); | 637 | viewportmanager_theme_undo(i, skin_has_sbs(i, skin_get_gwps(WPS, i)->data)); |
@@ -678,7 +678,7 @@ static void gwps_enter_wps(void) | |||
678 | } | 678 | } |
679 | #endif | 679 | #endif |
680 | /* make the backdrop actually take effect */ | 680 | /* make the backdrop actually take effect */ |
681 | #if LCD_DEPTH > 1 || defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 | 681 | #ifdef HAVE_BACKDROP_IMAGE |
682 | skin_backdrop_show(gwps->data->backdrop_id); | 682 | skin_backdrop_show(gwps->data->backdrop_id); |
683 | #endif | 683 | #endif |
684 | display->clear_display(); | 684 | display->clear_display(); |
diff --git a/apps/menus/theme_menu.c b/apps/menus/theme_menu.c index 4aceb83291..f5af1c7b78 100644 --- a/apps/menus/theme_menu.c +++ b/apps/menus/theme_menu.c | |||
@@ -40,7 +40,7 @@ | |||
40 | #include "statusbar-skinned.h" | 40 | #include "statusbar-skinned.h" |
41 | #include "skin_engine/skin_engine.h" | 41 | #include "skin_engine/skin_engine.h" |
42 | 42 | ||
43 | #if LCD_DEPTH > 1 | 43 | #ifdef HAVE_BACKDROP_IMAGE |
44 | /** | 44 | /** |
45 | * Menu to clear the backdrop image | 45 | * Menu to clear the backdrop image |
46 | */ | 46 | */ |
@@ -387,7 +387,7 @@ MAKE_MENU(theme_menu, ID2P(LANG_THEME_MENU), | |||
387 | &browse_rsbs, | 387 | &browse_rsbs, |
388 | #endif | 388 | #endif |
389 | &show_icons, | 389 | &show_icons, |
390 | #if LCD_DEPTH > 1 | 390 | #ifdef HAVE_BACKDROP_IMAGE |
391 | &clear_main_bd, | 391 | &clear_main_bd, |
392 | #endif | 392 | #endif |
393 | #ifdef HAVE_LCD_BITMAP | 393 | #ifdef HAVE_LCD_BITMAP |
diff --git a/apps/radio/radio_skin.c b/apps/radio/radio_skin.c index 055de90429..2c9c369979 100644 --- a/apps/radio/radio_skin.c +++ b/apps/radio/radio_skin.c | |||
@@ -69,7 +69,7 @@ void fms_fix_displays(enum fms_exiting toggle_state) | |||
69 | if (toggle_state == FMS_ENTER) | 69 | if (toggle_state == FMS_ENTER) |
70 | { | 70 | { |
71 | viewportmanager_theme_enable(i, skin_has_sbs(i, data), NULL); | 71 | viewportmanager_theme_enable(i, skin_has_sbs(i, data), NULL); |
72 | #if LCD_DEPTH > 1 || defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 | 72 | #ifdef HAVE_BACKDROP_IMAGE |
73 | skin_backdrop_show(data->backdrop_id); | 73 | skin_backdrop_show(data->backdrop_id); |
74 | #endif | 74 | #endif |
75 | screens[i].clear_display(); | 75 | screens[i].clear_display(); |
@@ -79,7 +79,7 @@ void fms_fix_displays(enum fms_exiting toggle_state) | |||
79 | else | 79 | else |
80 | { | 80 | { |
81 | screens[i].stop_scroll(); | 81 | screens[i].stop_scroll(); |
82 | #if LCD_DEPTH > 1 || defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 | 82 | #ifdef HAVE_BACKDROP_IMAGE |
83 | skin_backdrop_show(sb_get_backdrop(i)); | 83 | skin_backdrop_show(sb_get_backdrop(i)); |
84 | #endif | 84 | #endif |
85 | viewportmanager_theme_undo(i, skin_has_sbs(i, data)); | 85 | viewportmanager_theme_undo(i, skin_has_sbs(i, data)); |
diff --git a/firmware/export/config.h b/firmware/export/config.h index 2e7b4dc4d6..a7f0a3578f 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -655,6 +655,10 @@ Lyre prototype 1 */ | |||
655 | #define CONFIG_REMOTE_DEFAULT_ICON_WIDTH 6 | 655 | #define CONFIG_REMOTE_DEFAULT_ICON_WIDTH 6 |
656 | #endif | 656 | #endif |
657 | 657 | ||
658 | #if LCD_DEPTH > 1 || defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1 | ||
659 | #define HAVE_BACKDROP_IMAGE | ||
660 | #endif | ||
661 | |||
658 | #if (CONFIG_TUNER & (CONFIG_TUNER - 1)) != 0 | 662 | #if (CONFIG_TUNER & (CONFIG_TUNER - 1)) != 0 |
659 | /* Multiple possible tuners */ | 663 | /* Multiple possible tuners */ |
660 | #define CONFIG_TUNER_MULTI | 664 | #define CONFIG_TUNER_MULTI |