diff options
author | Robert Hak <adiamas@rockbox.org> | 2002-08-31 20:57:53 +0000 |
---|---|---|
committer | Robert Hak <adiamas@rockbox.org> | 2002-08-31 20:57:53 +0000 |
commit | 1b9109aba276a4fd33acdc81b81b6f924513a2fa (patch) | |
tree | 2e66743819221e09d009e5d71f3bfab99de9699d /apps | |
parent | 883adb5bfca70524c94d62bc8d3a2553772c6901 (diff) | |
download | rockbox-1b9109aba276a4fd33acdc81b81b6f924513a2fa.tar.gz rockbox-1b9109aba276a4fd33acdc81b81b6f924513a2fa.zip |
USE_SCREENSAVERS define added so that we can build w/o Screensavers for the recorders if we want
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2097 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/main_menu.c | 19 | ||||
-rw-r--r-- | apps/recorder/blank.c | 2 | ||||
-rw-r--r-- | apps/recorder/bounce.c | 2 | ||||
-rw-r--r-- | apps/recorder/boxes.c | 2 | ||||
-rw-r--r-- | apps/screensavers_menu.c | 2 |
5 files changed, 22 insertions, 5 deletions
diff --git a/apps/main_menu.c b/apps/main_menu.c index 9135ea3424..4001e156c3 100644 --- a/apps/main_menu.c +++ b/apps/main_menu.c | |||
@@ -37,10 +37,14 @@ | |||
37 | 37 | ||
38 | #ifdef HAVE_LCD_BITMAP | 38 | #ifdef HAVE_LCD_BITMAP |
39 | #include "games_menu.h" | 39 | #include "games_menu.h" |
40 | #include "screensavers_menu.h" | ||
41 | #include "bmp.h" | 40 | #include "bmp.h" |
42 | #include "icons.h" | 41 | #include "icons.h" |
43 | #endif | 42 | |
43 | #ifdef USE_SCREENSAVERS | ||
44 | #include "screensavers_menu.h" | ||
45 | #endif /* End USE_SCREENSAVERS */ | ||
46 | |||
47 | #endif /* End HAVE_LCD_BITMAP */ | ||
44 | 48 | ||
45 | int show_logo( void ) | 49 | int show_logo( void ) |
46 | { | 50 | { |
@@ -159,17 +163,20 @@ Menu show_info(void) | |||
159 | #endif | 163 | #endif |
160 | 164 | ||
161 | #ifdef HAVE_LCD_CHARCELLS | 165 | #ifdef HAVE_LCD_CHARCELLS |
162 | snprintf(s, sizeof(s), "Batt: %d%%%s", battery_level(), battery_level_safe() ? "" : "!"); | 166 | snprintf(s, sizeof(s), "Batt: %d%%%s", |
167 | battery_level(), battery_level_safe() ? "" : "!"); | ||
163 | lcd_puts(0, 1, s); | 168 | lcd_puts(0, 1, s); |
164 | #else | 169 | #else |
165 | #ifdef HAVE_CHARGE_CTRL | 170 | #ifdef HAVE_CHARGE_CTRL |
166 | if (charger_enabled) | 171 | if (charger_enabled) |
167 | snprintf(s, sizeof(s), "Battery: charging"); | 172 | snprintf(s, sizeof(s), "Battery: charging"); |
168 | else | 173 | else |
169 | snprintf(s, sizeof(s), "Battery: %d%%%s", battery_level(), battery_level_safe() ? "" : " !!"); | 174 | snprintf(s, sizeof(s), "Battery: %d%%%s", |
175 | battery_level(), battery_level_safe() ? "" : " !!"); | ||
170 | lcd_puts(0, 3, s); | 176 | lcd_puts(0, 3, s); |
171 | #else | 177 | #else |
172 | snprintf(s, sizeof(s), "Battery: %d%%%s", battery_level(), battery_level_safe() ? "" : " !!"); | 178 | snprintf(s, sizeof(s), "Battery: %d%%%s", |
179 | battery_level(), battery_level_safe() ? "" : " !!"); | ||
173 | lcd_puts(0, 3, s); | 180 | lcd_puts(0, 3, s); |
174 | #endif | 181 | #endif |
175 | #endif | 182 | #endif |
@@ -197,7 +204,9 @@ Menu main_menu(void) | |||
197 | { "General Settings", settings_menu }, | 204 | { "General Settings", settings_menu }, |
198 | #ifdef HAVE_LCD_BITMAP | 205 | #ifdef HAVE_LCD_BITMAP |
199 | { "Games", games_menu }, | 206 | { "Games", games_menu }, |
207 | #ifdef USE_SCREENSAVERS | ||
200 | { "Screensavers", screensavers_menu }, | 208 | { "Screensavers", screensavers_menu }, |
209 | #endif /* end USE_SCREENSAVERS */ | ||
201 | #endif | 210 | #endif |
202 | { "Info", show_info }, | 211 | { "Info", show_info }, |
203 | { "Version", show_credits }, | 212 | { "Version", show_credits }, |
diff --git a/apps/recorder/blank.c b/apps/recorder/blank.c index 2c59ec66bc..faa324f9c2 100644 --- a/apps/recorder/blank.c +++ b/apps/recorder/blank.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include "config.h" | 20 | #include "config.h" |
21 | 21 | ||
22 | #ifdef HAVE_LCD_BITMAP | 22 | #ifdef HAVE_LCD_BITMAP |
23 | #ifdef USE_SCREENSAVERS | ||
23 | 24 | ||
24 | #include "lcd.h" | 25 | #include "lcd.h" |
25 | #include "button.h" | 26 | #include "button.h" |
@@ -90,6 +91,7 @@ Menu blank(void) | |||
90 | } | 91 | } |
91 | 92 | ||
92 | #endif | 93 | #endif |
94 | #endif | ||
93 | 95 | ||
94 | 96 | ||
95 | 97 | ||
diff --git a/apps/recorder/bounce.c b/apps/recorder/bounce.c index cb080a0d00..cf269082f6 100644 --- a/apps/recorder/bounce.c +++ b/apps/recorder/bounce.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include "config.h" | 20 | #include "config.h" |
21 | 21 | ||
22 | #ifdef HAVE_LCD_BITMAP | 22 | #ifdef HAVE_LCD_BITMAP |
23 | #ifdef USE_SCREENSAVERS | ||
23 | 24 | ||
24 | #include "lcd.h" | 25 | #include "lcd.h" |
25 | #include "button.h" | 26 | #include "button.h" |
@@ -132,3 +133,4 @@ Menu bounce(void) | |||
132 | } | 133 | } |
133 | 134 | ||
134 | #endif | 135 | #endif |
136 | #endif | ||
diff --git a/apps/recorder/boxes.c b/apps/recorder/boxes.c index 9c38cd4e83..16667ecf3f 100644 --- a/apps/recorder/boxes.c +++ b/apps/recorder/boxes.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include "config.h" | 20 | #include "config.h" |
21 | 21 | ||
22 | #ifdef HAVE_LCD_BITMAP | 22 | #ifdef HAVE_LCD_BITMAP |
23 | #ifdef USE_SCREENSAVERS | ||
23 | 24 | ||
24 | #include "boxes.h" | 25 | #include "boxes.h" |
25 | #include "lcd.h" | 26 | #include "lcd.h" |
@@ -126,3 +127,4 @@ Menu boxes(void) | |||
126 | } | 127 | } |
127 | 128 | ||
128 | #endif | 129 | #endif |
130 | #endif | ||
diff --git a/apps/screensavers_menu.c b/apps/screensavers_menu.c index b184b916cc..6b53ebeabf 100644 --- a/apps/screensavers_menu.c +++ b/apps/screensavers_menu.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include "config.h" | 19 | #include "config.h" |
20 | 20 | ||
21 | #ifdef HAVE_LCD_BITMAP | 21 | #ifdef HAVE_LCD_BITMAP |
22 | #ifdef USE_SCREENSAVERS | ||
22 | 23 | ||
23 | #include <stdio.h> | 24 | #include <stdio.h> |
24 | #include <stdbool.h> | 25 | #include <stdbool.h> |
@@ -52,3 +53,4 @@ Menu screensavers_menu(void) | |||
52 | } | 53 | } |
53 | 54 | ||
54 | #endif | 55 | #endif |
56 | #endif | ||