diff options
-rw-r--r-- | apps/SOURCES | 7 | ||||
-rw-r--r-- | apps/bookmark.c | 2 | ||||
-rw-r--r-- | apps/filetree.c | 2 | ||||
-rw-r--r-- | apps/gui/backdrop.c (renamed from apps/recorder/backdrop.c) | 0 | ||||
-rw-r--r-- | apps/gui/backdrop.h (renamed from apps/recorder/backdrop.h) | 0 | ||||
-rw-r--r-- | apps/gui/gwps-common.c | 7 | ||||
-rw-r--r-- | apps/gui/gwps.c | 7 | ||||
-rw-r--r-- | apps/gui/wps_parser.c | 5 | ||||
-rw-r--r-- | apps/menus/display_menu.c | 5 | ||||
-rw-r--r-- | apps/onplay.c | 7 | ||||
-rw-r--r-- | apps/root_menu.c | 7 | ||||
-rw-r--r-- | apps/screens.c | 2 | ||||
-rw-r--r-- | apps/settings.c | 3 | ||||
-rw-r--r-- | apps/tree.c | 2 |
14 files changed, 33 insertions, 23 deletions
diff --git a/apps/SOURCES b/apps/SOURCES index 1dabb12d2b..9467914bca 100644 --- a/apps/SOURCES +++ b/apps/SOURCES | |||
@@ -62,6 +62,10 @@ gui/yesno.c | |||
62 | gui/wps_debug.c | 62 | gui/wps_debug.c |
63 | gui/wps_parser.c | 63 | gui/wps_parser.c |
64 | 64 | ||
65 | #if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1)) | ||
66 | gui/backdrop.c | ||
67 | #endif | ||
68 | |||
65 | #ifdef HAVE_LCD_CHARCELLS | 69 | #ifdef HAVE_LCD_CHARCELLS |
66 | player/icons.c | 70 | player/icons.c |
67 | player/keyboard.c | 71 | player/keyboard.c |
@@ -71,9 +75,6 @@ recorder/bmp.c | |||
71 | recorder/icons.c | 75 | recorder/icons.c |
72 | recorder/keyboard.c | 76 | recorder/keyboard.c |
73 | recorder/peakmeter.c | 77 | recorder/peakmeter.c |
74 | #if LCD_DEPTH > 1 | ||
75 | recorder/backdrop.c | ||
76 | #endif | ||
77 | #ifdef HAVE_LCD_COLOR | 78 | #ifdef HAVE_LCD_COLOR |
78 | gui/color_picker.c | 79 | gui/color_picker.c |
79 | #endif | 80 | #endif |
diff --git a/apps/bookmark.c b/apps/bookmark.c index cb0dbe718a..a878dedb13 100644 --- a/apps/bookmark.c +++ b/apps/bookmark.c | |||
@@ -51,7 +51,7 @@ | |||
51 | #include "splash.h" | 51 | #include "splash.h" |
52 | #include "yesno.h" | 52 | #include "yesno.h" |
53 | 53 | ||
54 | #if LCD_DEPTH > 1 | 54 | #if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1)) |
55 | #include "backdrop.h" | 55 | #include "backdrop.h" |
56 | #endif | 56 | #endif |
57 | 57 | ||
diff --git a/apps/filetree.c b/apps/filetree.c index 4a8e9c1868..7073e59f1b 100644 --- a/apps/filetree.c +++ b/apps/filetree.c | |||
@@ -50,7 +50,7 @@ | |||
50 | #include "radio.h" | 50 | #include "radio.h" |
51 | #endif | 51 | #endif |
52 | 52 | ||
53 | #if LCD_DEPTH > 1 | 53 | #if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1)) |
54 | #include "backdrop.h" | 54 | #include "backdrop.h" |
55 | #endif | 55 | #endif |
56 | 56 | ||
diff --git a/apps/recorder/backdrop.c b/apps/gui/backdrop.c index 0d023602be..0d023602be 100644 --- a/apps/recorder/backdrop.c +++ b/apps/gui/backdrop.c | |||
diff --git a/apps/recorder/backdrop.h b/apps/gui/backdrop.h index c930a87433..c930a87433 100644 --- a/apps/recorder/backdrop.h +++ b/apps/gui/backdrop.h | |||
diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c index 7f84be613b..5043b33ec0 100644 --- a/apps/gui/gwps-common.c +++ b/apps/gui/gwps-common.c | |||
@@ -49,13 +49,14 @@ | |||
49 | #include "bmp.h" | 49 | #include "bmp.h" |
50 | #include "atoi.h" | 50 | #include "atoi.h" |
51 | #endif | 51 | #endif |
52 | #if LCD_DEPTH > 1 | ||
53 | #include "backdrop.h" | ||
54 | #endif | ||
55 | #include "dsp.h" | 52 | #include "dsp.h" |
56 | #include "action.h" | 53 | #include "action.h" |
57 | #include "cuesheet.h" | 54 | #include "cuesheet.h" |
58 | 55 | ||
56 | #if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1)) | ||
57 | #include "backdrop.h" | ||
58 | #endif | ||
59 | |||
59 | #define FF_REWIND_MAX_PERCENT 3 /* cap ff/rewind step size at max % of file */ | 60 | #define FF_REWIND_MAX_PERCENT 3 /* cap ff/rewind step size at max % of file */ |
60 | /* 3% of 30min file == 54s step size */ | 61 | /* 3% of 30min file == 54s step size */ |
61 | #define MIN_FF_REWIND_STEP 500 | 62 | #define MIN_FF_REWIND_STEP 500 |
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c index 97f3b4dbbc..d8b2751847 100644 --- a/apps/gui/gwps.c +++ b/apps/gui/gwps.c | |||
@@ -55,12 +55,13 @@ | |||
55 | #include "playback.h" | 55 | #include "playback.h" |
56 | #include "splash.h" | 56 | #include "splash.h" |
57 | #include "cuesheet.h" | 57 | #include "cuesheet.h" |
58 | #if LCD_DEPTH > 1 | ||
59 | #include "backdrop.h" | ||
60 | #endif | ||
61 | #include "ata_idle_notify.h" | 58 | #include "ata_idle_notify.h" |
62 | #include "root_menu.h" | 59 | #include "root_menu.h" |
63 | 60 | ||
61 | #if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1)) | ||
62 | #include "backdrop.h" | ||
63 | #endif | ||
64 | |||
64 | /* currently only on wps_state is needed */ | 65 | /* currently only on wps_state is needed */ |
65 | struct wps_state wps_state; | 66 | struct wps_state wps_state; |
66 | struct gui_wps gui_wps[NB_SCREENS]; | 67 | struct gui_wps gui_wps[NB_SCREENS]; |
diff --git a/apps/gui/wps_parser.c b/apps/gui/wps_parser.c index 2b5d1bb321..6d8078aab9 100644 --- a/apps/gui/wps_parser.c +++ b/apps/gui/wps_parser.c | |||
@@ -30,9 +30,10 @@ | |||
30 | 30 | ||
31 | #ifdef HAVE_LCD_BITMAP | 31 | #ifdef HAVE_LCD_BITMAP |
32 | #include "bmp.h" | 32 | #include "bmp.h" |
33 | #if LCD_DEPTH > 1 | ||
34 | #include "backdrop.h" | ||
35 | #endif | 33 | #endif |
34 | |||
35 | #if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1)) | ||
36 | #include "backdrop.h" | ||
36 | #endif | 37 | #endif |
37 | 38 | ||
38 | #define WPS_DEFAULTCFG WPS_DIR "/rockbox_default.wps" | 39 | #define WPS_DEFAULTCFG WPS_DIR "/rockbox_default.wps" |
diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c index 9f6b2be624..18506e7304 100644 --- a/apps/menus/display_menu.c +++ b/apps/menus/display_menu.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include "tree.h" | 29 | #include "tree.h" |
30 | #include "list.h" | 30 | #include "list.h" |
31 | #ifdef HAVE_LCD_BITMAP | 31 | #ifdef HAVE_LCD_BITMAP |
32 | #include "backdrop.h" | ||
33 | #include "peakmeter.h" | 32 | #include "peakmeter.h" |
34 | #endif | 33 | #endif |
35 | #include "talk.h" | 34 | #include "talk.h" |
@@ -37,6 +36,10 @@ | |||
37 | #include "lcd.h" | 36 | #include "lcd.h" |
38 | #include "lcd-remote.h" | 37 | #include "lcd-remote.h" |
39 | 38 | ||
39 | #if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1)) | ||
40 | #include "backdrop.h" | ||
41 | #endif | ||
42 | |||
40 | 43 | ||
41 | #ifdef HAVE_BACKLIGHT | 44 | #ifdef HAVE_BACKLIGHT |
42 | int filterfirstkeypress_callback(int action,const struct menu_item_ex *this_item) | 45 | int filterfirstkeypress_callback(int action,const struct menu_item_ex *this_item) |
diff --git a/apps/onplay.c b/apps/onplay.c index 6314bd932c..0bd2b01c1c 100644 --- a/apps/onplay.c +++ b/apps/onplay.c | |||
@@ -50,9 +50,6 @@ | |||
50 | #include "action.h" | 50 | #include "action.h" |
51 | #include "splash.h" | 51 | #include "splash.h" |
52 | #include "yesno.h" | 52 | #include "yesno.h" |
53 | #if LCD_DEPTH > 1 | ||
54 | #include "backdrop.h" | ||
55 | #endif | ||
56 | #ifdef HAVE_LCD_BITMAP | 53 | #ifdef HAVE_LCD_BITMAP |
57 | #include "icons.h" | 54 | #include "icons.h" |
58 | #endif | 55 | #endif |
@@ -67,6 +64,10 @@ | |||
67 | #include "tagtree.h" | 64 | #include "tagtree.h" |
68 | #endif | 65 | #endif |
69 | 66 | ||
67 | #if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1)) | ||
68 | #include "backdrop.h" | ||
69 | #endif | ||
70 | |||
70 | static int context; | 71 | static int context; |
71 | static char* selected_file = NULL; | 72 | static char* selected_file = NULL; |
72 | static int selected_file_attr = 0; | 73 | static int selected_file_attr = 0; |
diff --git a/apps/root_menu.c b/apps/root_menu.c index ebb13ecb92..5f16a0ecb8 100644 --- a/apps/root_menu.c +++ b/apps/root_menu.c | |||
@@ -32,12 +32,13 @@ | |||
32 | #include "rolo.h" | 32 | #include "rolo.h" |
33 | #include "powermgmt.h" | 33 | #include "powermgmt.h" |
34 | #include "power.h" | 34 | #include "power.h" |
35 | #include "talk.h" | ||
36 | #include "audio.h" | ||
35 | 37 | ||
36 | #if LCD_DEPTH > 1 | 38 | #if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1)) |
37 | #include "backdrop.h" | 39 | #include "backdrop.h" |
38 | #endif | 40 | #endif |
39 | #include "talk.h" | 41 | |
40 | #include "audio.h" | ||
41 | 42 | ||
42 | /* gui api */ | 43 | /* gui api */ |
43 | #include "list.h" | 44 | #include "list.h" |
diff --git a/apps/screens.c b/apps/screens.c index 82ae490d75..a9f84be686 100644 --- a/apps/screens.c +++ b/apps/screens.c | |||
@@ -72,7 +72,7 @@ | |||
72 | #include "dsp.h" | 72 | #include "dsp.h" |
73 | #endif | 73 | #endif |
74 | 74 | ||
75 | #ifdef HAVE_LCD_COLOR | 75 | #if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1)) |
76 | #include "backdrop.h" | 76 | #include "backdrop.h" |
77 | #endif | 77 | #endif |
78 | 78 | ||
diff --git a/apps/settings.c b/apps/settings.c index ba4a98c4e2..35a063bf96 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -61,7 +61,8 @@ | |||
61 | #include "splash.h" | 61 | #include "splash.h" |
62 | #include "list.h" | 62 | #include "list.h" |
63 | #include "settings_list.h" | 63 | #include "settings_list.h" |
64 | #if LCD_DEPTH > 1 | 64 | |
65 | #if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1)) | ||
65 | #include "backdrop.h" | 66 | #include "backdrop.h" |
66 | #endif | 67 | #endif |
67 | 68 | ||
diff --git a/apps/tree.c b/apps/tree.c index b847a7f112..03683dbce7 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -81,7 +81,7 @@ | |||
81 | 81 | ||
82 | #include "root_menu.h" | 82 | #include "root_menu.h" |
83 | 83 | ||
84 | #if LCD_DEPTH > 1 | 84 | #if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1)) |
85 | #include "backdrop.h" | 85 | #include "backdrop.h" |
86 | #endif | 86 | #endif |
87 | 87 | ||