diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-07-17 10:31:31 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-07-24 21:20:13 +0000 |
commit | 658026e6267277b27d297c481728f74d160a8481 (patch) | |
tree | 915a9d2bb48469bdd5b9127dc19a61f230721a6c /apps/gui/usb_screen.c | |
parent | 8cb555460ff79e636a7907fb2589e16db98c8600 (diff) | |
download | rockbox-658026e6267277b27d297c481728f74d160a8481.tar.gz rockbox-658026e6267277b27d297c481728f74d160a8481.zip |
[4/4] Remove HAVE_LCD_BITMAP, as it's now the only choice.
Note: I left behind lcd_bitmap in features.txt, because removing it
would require considerable work in the manual and the translations.
Change-Id: Ia8ca7761f610d9332a0d22a7d189775fb15ec88a
Diffstat (limited to 'apps/gui/usb_screen.c')
-rw-r--r-- | apps/gui/usb_screen.c | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/apps/gui/usb_screen.c b/apps/gui/usb_screen.c index dd1d97df3c..3169831322 100644 --- a/apps/gui/usb_screen.c +++ b/apps/gui/usb_screen.c | |||
@@ -42,9 +42,7 @@ | |||
42 | #include "playlist.h" | 42 | #include "playlist.h" |
43 | #include "misc.h" | 43 | #include "misc.h" |
44 | 44 | ||
45 | #ifdef HAVE_LCD_BITMAP | ||
46 | #include "bitmaps/usblogo.h" | 45 | #include "bitmaps/usblogo.h" |
47 | #endif | ||
48 | 46 | ||
49 | #ifdef HAVE_REMOTE_LCD | 47 | #ifdef HAVE_REMOTE_LCD |
50 | #include "bitmaps/remote_usblogo.h" | 48 | #include "bitmaps/remote_usblogo.h" |
@@ -122,15 +120,12 @@ static int handle_usb_events(void) | |||
122 | struct usb_screen_vps_t | 120 | struct usb_screen_vps_t |
123 | { | 121 | { |
124 | struct viewport parent; | 122 | struct viewport parent; |
125 | #ifdef HAVE_LCD_BITMAP | ||
126 | struct viewport logo; | 123 | struct viewport logo; |
127 | #ifdef USB_ENABLE_HID | 124 | #ifdef USB_ENABLE_HID |
128 | struct viewport title; | 125 | struct viewport title; |
129 | #endif | 126 | #endif |
130 | #endif | ||
131 | }; | 127 | }; |
132 | 128 | ||
133 | #ifdef HAVE_LCD_BITMAP | ||
134 | static void usb_screen_fix_viewports(struct screen *screen, | 129 | static void usb_screen_fix_viewports(struct screen *screen, |
135 | struct usb_screen_vps_t *usb_screen_vps) | 130 | struct usb_screen_vps_t *usb_screen_vps) |
136 | { | 131 | { |
@@ -181,18 +176,15 @@ static void usb_screen_fix_viewports(struct screen *screen, | |||
181 | } | 176 | } |
182 | #endif | 177 | #endif |
183 | } | 178 | } |
184 | #endif | ||
185 | 179 | ||
186 | static void usb_screens_draw(struct usb_screen_vps_t *usb_screen_vps_ar) | 180 | static void usb_screens_draw(struct usb_screen_vps_t *usb_screen_vps_ar) |
187 | { | 181 | { |
188 | #ifdef HAVE_LCD_BITMAP | ||
189 | static const struct bitmap* logos[NB_SCREENS] = { | 182 | static const struct bitmap* logos[NB_SCREENS] = { |
190 | &bm_usblogo, | 183 | &bm_usblogo, |
191 | #ifdef HAVE_REMOTE_LCD | 184 | #ifdef HAVE_REMOTE_LCD |
192 | &bm_remote_usblogo, | 185 | &bm_remote_usblogo, |
193 | #endif | 186 | #endif |
194 | }; | 187 | }; |
195 | #endif | ||
196 | 188 | ||
197 | FOR_NB_SCREENS(i) | 189 | FOR_NB_SCREENS(i) |
198 | { | 190 | { |
@@ -200,15 +192,12 @@ static void usb_screens_draw(struct usb_screen_vps_t *usb_screen_vps_ar) | |||
200 | 192 | ||
201 | struct usb_screen_vps_t *usb_screen_vps = &usb_screen_vps_ar[i]; | 193 | struct usb_screen_vps_t *usb_screen_vps = &usb_screen_vps_ar[i]; |
202 | struct viewport *parent = &usb_screen_vps->parent; | 194 | struct viewport *parent = &usb_screen_vps->parent; |
203 | #ifdef HAVE_LCD_BITMAP | ||
204 | struct viewport *logo = &usb_screen_vps->logo; | 195 | struct viewport *logo = &usb_screen_vps->logo; |
205 | #endif | ||
206 | 196 | ||
207 | screen->set_viewport(parent); | 197 | screen->set_viewport(parent); |
208 | screen->clear_viewport(); | 198 | screen->clear_viewport(); |
209 | screen->backlight_on(); | 199 | screen->backlight_on(); |
210 | 200 | ||
211 | #ifdef HAVE_LCD_BITMAP | ||
212 | screen->set_viewport(logo); | 201 | screen->set_viewport(logo); |
213 | screen->bmp(logos[i], 0, 0); | 202 | screen->bmp(logos[i], 0, 0); |
214 | if (i == SCREEN_MAIN) | 203 | if (i == SCREEN_MAIN) |
@@ -228,14 +217,6 @@ static void usb_screens_draw(struct usb_screen_vps_t *usb_screen_vps_ar) | |||
228 | } | 217 | } |
229 | screen->set_viewport(parent); | 218 | screen->set_viewport(parent); |
230 | 219 | ||
231 | #else /* !HAVE_LCD_BITMAP */ | ||
232 | screen->double_height(false); | ||
233 | screen->puts_scroll(0, 0, "[USB Mode]"); | ||
234 | status_set_param(false); | ||
235 | status_set_audio(false); | ||
236 | status_set_usb(true); | ||
237 | #endif /* HAVE_LCD_BITMAP */ | ||
238 | |||
239 | screen->set_viewport(NULL); | 220 | screen->set_viewport(NULL); |
240 | screen->update_viewport(); | 221 | screen->update_viewport(); |
241 | } | 222 | } |
@@ -275,13 +256,11 @@ void gui_usb_screen_run(bool early_usb) | |||
275 | /* update the UI before disabling fonts, this maximizes the propability | 256 | /* update the UI before disabling fonts, this maximizes the propability |
276 | * that font cache lookups succeed during USB */ | 257 | * that font cache lookups succeed during USB */ |
277 | send_event(GUI_EVENT_ACTIONUPDATE, NULL); | 258 | send_event(GUI_EVENT_ACTIONUPDATE, NULL); |
278 | #ifdef HAVE_LCD_BITMAP | ||
279 | if(!early_usb) | 259 | if(!early_usb) |
280 | { | 260 | { |
281 | /* The font system leaves the .fnt fd's open, so we need for force close them all */ | 261 | /* The font system leaves the .fnt fd's open, so we need for force close them all */ |
282 | font_disable_all(); | 262 | font_disable_all(); |
283 | } | 263 | } |
284 | #endif | ||
285 | 264 | ||
286 | usb_acknowledge(SYS_USB_CONNECTED_ACK); | 265 | usb_acknowledge(SYS_USB_CONNECTED_ACK); |
287 | 266 | ||
@@ -302,10 +281,8 @@ void gui_usb_screen_run(bool early_usb) | |||
302 | { | 281 | { |
303 | const struct viewport* vp = NULL; | 282 | const struct viewport* vp = NULL; |
304 | 283 | ||
305 | #if defined(HAVE_LCD_BITMAP) && defined(USB_ENABLE_HID) | 284 | #if defined(USB_ENABLE_HID) |
306 | vp = usb_hid ? &usb_screen_vps_ar[i].title : NULL; | 285 | vp = usb_hid ? &usb_screen_vps_ar[i].title : NULL; |
307 | #elif !defined(HAVE_LCD_BITMAP) | ||
308 | vp = &usb_screen_vps_ar[i].parent; | ||
309 | #endif | 286 | #endif |
310 | if (vp) | 287 | if (vp) |
311 | screens[i].scroll_stop_viewport(vp); | 288 | screens[i].scroll_stop_viewport(vp); |
@@ -322,7 +299,6 @@ void gui_usb_screen_run(bool early_usb) | |||
322 | touchscreen_set_mode(old_mode); | 299 | touchscreen_set_mode(old_mode); |
323 | #endif | 300 | #endif |
324 | 301 | ||
325 | #ifdef HAVE_LCD_BITMAP | ||
326 | if(!early_usb) | 302 | if(!early_usb) |
327 | { | 303 | { |
328 | font_enable_all(); | 304 | font_enable_all(); |
@@ -331,7 +307,6 @@ void gui_usb_screen_run(bool early_usb) | |||
331 | /* Reload playlist */ | 307 | /* Reload playlist */ |
332 | playlist_resume(); | 308 | playlist_resume(); |
333 | } | 309 | } |
334 | #endif | ||
335 | 310 | ||
336 | FOR_NB_SCREENS(i) | 311 | FOR_NB_SCREENS(i) |
337 | { | 312 | { |