Remove unnecessary (and incorrect) #ifdefs surrounding #include "backdrop.h", and correct remaining references to HAVE_LCD_REMOTE to HAVE_REMOTE_LCD

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16873 a1c6a512-1295-4272-9138-f99709370657

13 files changed, 4 insertions, 40 deletions

diff --git a/apps/SOURCES b/apps/SOURCES
index 96b5c0f..b1e5cce 100644
--- a/apps/SOURCES
+++ b/apps/SOURCES
@@ -70,7 +70,7 @@ gui/wps_debug.c
 gui/wps_parser.c
 gui/viewport.c
 
-#if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1))
+#if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1))
 gui/backdrop.c
 #endif
 
diff --git a/apps/bookmark.c b/apps/bookmark.c
index 1a7d581..39a9aa0 100644
--- a/apps/bookmark.c
+++ b/apps/bookmark.c
@@ -51,10 +51,7 @@
 #include "yesno.h"
 #include "list.h"
 #include "plugin.h"
-
-#if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1))
 #include "backdrop.h"
-#endif
 
 #define MAX_BOOKMARKS 10
 #define MAX_BOOKMARK_SIZE  350
diff --git a/apps/filetree.c b/apps/filetree.c
index 34bed71..97732cc 100644
--- a/apps/filetree.c
+++ b/apps/filetree.c
@@ -49,9 +49,7 @@
 #include "radio.h"
 #endif
 
-#if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1))
 #include "backdrop.h"
-#endif
 
 int ft_build_playlist(struct tree_context* c, int start_index)
 {
diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c
index 234cd62..f2b444f 100644
--- a/apps/gui/gwps-common.c
+++ b/apps/gui/gwps-common.c
@@ -57,10 +57,7 @@
 #if CONFIG_CODEC == SWCODEC
 #include "playback.h"
 #endif
-
-#if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1))
 #include "backdrop.h"
-#endif
 
 #define FF_REWIND_MAX_PERCENT 3 /* cap ff/rewind step size at max % of file */ 
                                 /* 3% of 30min file == 54s step size */
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c
index df1295d..0520357 100644
--- a/apps/gui/gwps.c
+++ b/apps/gui/gwps.c
@@ -56,10 +56,7 @@
 #include "cuesheet.h"
 #include "ata_idle_notify.h"
 #include "root_menu.h"
-
-#if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1))
 #include "backdrop.h"
-#endif
 
 /* currently only on wps_state is needed */
 struct wps_state wps_state;
diff --git a/apps/gui/wps_parser.c b/apps/gui/wps_parser.c
index 9bbdb2e..f6b2178 100644
--- a/apps/gui/wps_parser.c
+++ b/apps/gui/wps_parser.c
@@ -47,9 +47,7 @@
 #include "bmp.h"
 #endif
 
-#if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1))
 #include "backdrop.h"
-#endif
 
 #endif
 
@@ -329,7 +327,7 @@ static const struct wps_tag all_tags[] = {
 
     { WPS_NO_TOKEN,                       "V",   0,    parse_viewport      },
 
-#if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1))
+#if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1))
     { WPS_TOKEN_IMAGE_BACKDROP,           "X",   0,    parse_image_special },
 #endif
 #endif
@@ -1425,7 +1423,7 @@ static bool load_wps_bitmaps(struct wps_data *wps_data, char *bmpdir)
         }
     }
 
-#if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1))
+#if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1))
     if (bmp_names[BACKDROP_BMP])
     {
         get_image_filename(bmp_names[BACKDROP_BMP], bmpdir,
diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c
index 5b11bed..d593e9b 100644
--- a/apps/menus/display_menu.c
+++ b/apps/menus/display_menu.c
@@ -34,11 +34,7 @@
 #include "color_picker.h"
 #include "lcd.h"
 #include "lcd-remote.h"
-
-#if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1))
 #include "backdrop.h"
-#endif
-
 
 #ifdef HAVE_BACKLIGHT
 int filterfirstkeypress_callback(int action,const struct menu_item_ex *this_item)
diff --git a/apps/menus/theme_menu.c b/apps/menus/theme_menu.c
index 80da1aa..21f7ba4 100644
--- a/apps/menus/theme_menu.c
+++ b/apps/menus/theme_menu.c
@@ -34,10 +34,7 @@
 #include "color_picker.h"
 #include "lcd.h"
 #include "lcd-remote.h"
-
-#if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1))
 #include "backdrop.h"
-#endif
 #include "exported_menus.h"
 
 #if LCD_DEPTH > 1
diff --git a/apps/onplay.c b/apps/onplay.c
index ac772ac..5374bc0 100644
--- a/apps/onplay.c
+++ b/apps/onplay.c
@@ -64,10 +64,7 @@
 #include "tagtree.h"
 #endif
 #include "cuesheet.h"
-
-#if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1))
 #include "backdrop.h"
-#endif
 
 static int context;
 static char* selected_file = NULL;
diff --git a/apps/root_menu.c b/apps/root_menu.c
index 281a528..dcbd95c 100644
--- a/apps/root_menu.c
+++ b/apps/root_menu.c
@@ -35,11 +35,7 @@
 #include "talk.h"
 #include "audio.h"
 #include "hotswap.h"
-
-#if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1))
 #include "backdrop.h"
-#endif
-
 
 /* gui api */
 #include "list.h"
diff --git a/apps/screens.c b/apps/screens.c
index 8d6ebfe..81dae1f 100644
--- a/apps/screens.c
+++ b/apps/screens.c
@@ -56,6 +56,7 @@
 #include "pcmbuf.h"
 #include "list.h"
 #include "yesno.h"
+#include "backdrop.h"
 
 #ifdef HAVE_LCD_BITMAP
 #include <bitmaps/usblogo.h>
@@ -72,10 +73,6 @@
 #include "dsp.h"
 #endif
 
-#if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1))
-#include "backdrop.h"
-#endif
-
 #ifdef HAVE_LCD_BITMAP
 #define SCROLLBAR_WIDTH  6
 #endif
diff --git a/apps/settings.c b/apps/settings.c
index 56d59f4..895db69 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -63,10 +63,7 @@
 #include "settings_list.h"
 #include "filetypes.h"
 #include "option_select.h"
-
-#if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1))
 #include "backdrop.h"
-#endif
 
 #if CONFIG_TUNER
 #include "radio.h"
diff --git a/apps/tree.c b/apps/tree.c
index fc263a0..4d3b9fa 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -79,10 +79,7 @@
 #include "action.h"
 
 #include "root_menu.h"
-
-#if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1))
 #include "backdrop.h"
-#endif
 
 static const struct filetype *filetypes;
 static int filetypes_count;