From d746b793178cf3b55a1405bf97e07c2adeca9769 Mon Sep 17 00:00:00 2001 From: Dave Chapman Date: Sat, 29 Mar 2008 01:14:10 +0000 Subject: [PATCH] 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 --- apps/SOURCES | 2 +- apps/bookmark.c | 3 --- apps/filetree.c | 2 -- apps/gui/gwps-common.c | 3 --- apps/gui/gwps.c | 3 --- apps/gui/wps_parser.c | 6 ++---- apps/menus/display_menu.c | 4 ---- apps/menus/theme_menu.c | 3 --- apps/onplay.c | 3 --- apps/root_menu.c | 4 ---- apps/screens.c | 5 +---- apps/settings.c | 3 --- apps/tree.c | 3 --- 13 files changed, 4 insertions(+), 40 deletions(-) diff --git a/apps/SOURCES b/apps/SOURCES index 96b5c0f825..b1e5cce75d 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 1a7d58156f..39a9aa07d2 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 34bed71499..97732ccc82 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 234cd62a64..f2b444f7da 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 df1295db97..0520357002 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 9bbdb2e5d0..f6b21781a2 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 5b11bed7ed..d593e9b8f3 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 80da1aaab9..21f7ba4a80 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 ac772aca0b..5374bc0a61 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 281a528574..dcbd95c23f 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 8d6ebfe36d..81dae1f413 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 @@ -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 56d59f419f..895db69745 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 fc263a0568..4d3b9faca1 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;