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/misc.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/misc.c')
-rw-r--r-- | apps/misc.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/apps/misc.c b/apps/misc.c index b20a0095ab..2d60ecca49 100644 --- a/apps/misc.c +++ b/apps/misc.c | |||
@@ -84,10 +84,10 @@ | |||
84 | #if defined(HAVE_RECORDING) && !defined(__PCTOOL__) | 84 | #if defined(HAVE_RECORDING) && !defined(__PCTOOL__) |
85 | #include "recording.h" | 85 | #include "recording.h" |
86 | #endif | 86 | #endif |
87 | #if defined(HAVE_LCD_BITMAP) && !defined(__PCTOOL__) | 87 | #if !defined(__PCTOOL__) |
88 | #include "bmp.h" | 88 | #include "bmp.h" |
89 | #include "icons.h" | 89 | #include "icons.h" |
90 | #endif /* End HAVE_LCD_BITMAP */ | 90 | #endif /* !__PCTOOL__ */ |
91 | #include "bookmark.h" | 91 | #include "bookmark.h" |
92 | #include "wps.h" | 92 | #include "wps.h" |
93 | #include "playback.h" | 93 | #include "playback.h" |
@@ -712,7 +712,6 @@ long default_event_handler(long event) | |||
712 | 712 | ||
713 | int show_logo( void ) | 713 | int show_logo( void ) |
714 | { | 714 | { |
715 | #ifdef HAVE_LCD_BITMAP | ||
716 | char version[32]; | 715 | char version[32]; |
717 | int font_h, font_w; | 716 | int font_h, font_w; |
718 | 717 | ||
@@ -735,14 +734,6 @@ int show_logo( void ) | |||
735 | #endif | 734 | #endif |
736 | lcd_setfont(FONT_UI); | 735 | lcd_setfont(FONT_UI); |
737 | 736 | ||
738 | #else | ||
739 | char *rockbox = " ROCKbox!"; | ||
740 | |||
741 | lcd_clear_display(); | ||
742 | lcd_double_height(true); | ||
743 | lcd_puts(0, 0, rockbox); | ||
744 | lcd_puts_scroll(0, 1, rbversion); | ||
745 | #endif | ||
746 | lcd_update(); | 737 | lcd_update(); |
747 | 738 | ||
748 | #ifdef HAVE_REMOTE_LCD | 739 | #ifdef HAVE_REMOTE_LCD |
@@ -1439,7 +1430,6 @@ int hex_to_rgb(const char* hex, int* color) | |||
1439 | } | 1430 | } |
1440 | #endif /* HAVE_LCD_COLOR */ | 1431 | #endif /* HAVE_LCD_COLOR */ |
1441 | 1432 | ||
1442 | #ifdef HAVE_LCD_BITMAP | ||
1443 | /* '0'-'3' are ASCII 0x30 to 0x33 */ | 1433 | /* '0'-'3' are ASCII 0x30 to 0x33 */ |
1444 | #define is0123(x) (((x) & 0xfc) == 0x30) | 1434 | #define is0123(x) (((x) & 0xfc) == 0x30) |
1445 | #if !defined(__PCTOOL__) || defined(CHECKWPS) | 1435 | #if !defined(__PCTOOL__) || defined(CHECKWPS) |
@@ -1482,7 +1472,6 @@ int clamp_value_wrap(int value, int max, int min) | |||
1482 | return value; | 1472 | return value; |
1483 | } | 1473 | } |
1484 | #endif | 1474 | #endif |
1485 | #endif | ||
1486 | 1475 | ||
1487 | 1476 | ||
1488 | #ifndef __PCTOOL__ | 1477 | #ifndef __PCTOOL__ |
@@ -1494,25 +1483,21 @@ static int current_activity_top = 0; | |||
1494 | void push_current_activity(enum current_activity screen) | 1483 | void push_current_activity(enum current_activity screen) |
1495 | { | 1484 | { |
1496 | current_activity[current_activity_top++] = screen; | 1485 | current_activity[current_activity_top++] = screen; |
1497 | #ifdef HAVE_LCD_BITMAP | ||
1498 | FOR_NB_SCREENS(i) | 1486 | FOR_NB_SCREENS(i) |
1499 | { | 1487 | { |
1500 | skinlist_set_cfg(i, NULL); | 1488 | skinlist_set_cfg(i, NULL); |
1501 | skin_update(CUSTOM_STATUSBAR, i, SKIN_REFRESH_ALL); | 1489 | skin_update(CUSTOM_STATUSBAR, i, SKIN_REFRESH_ALL); |
1502 | } | 1490 | } |
1503 | #endif | ||
1504 | } | 1491 | } |
1505 | 1492 | ||
1506 | void pop_current_activity(void) | 1493 | void pop_current_activity(void) |
1507 | { | 1494 | { |
1508 | current_activity_top--; | 1495 | current_activity_top--; |
1509 | #ifdef HAVE_LCD_BITMAP | ||
1510 | FOR_NB_SCREENS(i) | 1496 | FOR_NB_SCREENS(i) |
1511 | { | 1497 | { |
1512 | skinlist_set_cfg(i, NULL); | 1498 | skinlist_set_cfg(i, NULL); |
1513 | skin_update(CUSTOM_STATUSBAR, i, SKIN_REFRESH_ALL); | 1499 | skin_update(CUSTOM_STATUSBAR, i, SKIN_REFRESH_ALL); |
1514 | } | 1500 | } |
1515 | #endif | ||
1516 | } | 1501 | } |
1517 | enum current_activity get_current_activity(void) | 1502 | enum current_activity get_current_activity(void) |
1518 | { | 1503 | { |