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/plugin.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/plugin.c')
-rw-r--r-- | apps/plugin.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/apps/plugin.c b/apps/plugin.c index 4c0f44b2e8..4fe8544527 100644 --- a/apps/plugin.c +++ b/apps/plugin.c | |||
@@ -50,12 +50,10 @@ | |||
50 | #include "power.h" | 50 | #include "power.h" |
51 | #endif | 51 | #endif |
52 | 52 | ||
53 | #ifdef HAVE_LCD_BITMAP | ||
54 | #include "scrollbar.h" | 53 | #include "scrollbar.h" |
55 | #include "peakmeter.h" | 54 | #include "peakmeter.h" |
56 | #include "bmp.h" | 55 | #include "bmp.h" |
57 | #include "bidi.h" | 56 | #include "bidi.h" |
58 | #endif | ||
59 | 57 | ||
60 | #ifdef USB_ENABLE_HID | 58 | #ifdef USB_ENABLE_HID |
61 | #include "usbstack/usb_hid.h" | 59 | #include "usbstack/usb_hid.h" |
@@ -301,11 +299,9 @@ static const struct plugin_api rockbox_api = { | |||
301 | #endif | 299 | #endif |
302 | 300 | ||
303 | viewport_set_defaults, | 301 | viewport_set_defaults, |
304 | #ifdef HAVE_LCD_BITMAP | ||
305 | viewportmanager_theme_enable, | 302 | viewportmanager_theme_enable, |
306 | viewportmanager_theme_undo, | 303 | viewportmanager_theme_undo, |
307 | viewport_set_fullscreen, | 304 | viewport_set_fullscreen, |
308 | #endif | ||
309 | 305 | ||
310 | #ifdef HAVE_BACKLIGHT | 306 | #ifdef HAVE_BACKLIGHT |
311 | /* lcd backlight */ | 307 | /* lcd backlight */ |
@@ -533,7 +529,7 @@ static const struct plugin_api rockbox_api = { | |||
533 | 529 | ||
534 | #if (CONFIG_PLATFORM & PLATFORM_HOSTED) | 530 | #if (CONFIG_PLATFORM & PLATFORM_HOSTED) |
535 | /* special simulator hooks */ | 531 | /* special simulator hooks */ |
536 | #if defined(HAVE_LCD_BITMAP) && LCD_DEPTH < 8 | 532 | #if LCD_DEPTH < 8 |
537 | sim_lcd_ex_init, | 533 | sim_lcd_ex_init, |
538 | sim_lcd_ex_update_rect, | 534 | sim_lcd_ex_update_rect, |
539 | #endif | 535 | #endif |
@@ -780,7 +776,6 @@ static const struct plugin_api rockbox_api = { | |||
780 | remove_array_ptr, | 776 | remove_array_ptr, |
781 | round_value_to_list32, | 777 | round_value_to_list32, |
782 | 778 | ||
783 | #ifdef HAVE_LCD_BITMAP | ||
784 | read_bmp_file, | 779 | read_bmp_file, |
785 | read_bmp_fd, | 780 | read_bmp_fd, |
786 | #ifdef HAVE_JPEG | 781 | #ifdef HAVE_JPEG |
@@ -788,7 +783,6 @@ static const struct plugin_api rockbox_api = { | |||
788 | read_jpeg_fd, | 783 | read_jpeg_fd, |
789 | #endif | 784 | #endif |
790 | screen_dump_set_hook, | 785 | screen_dump_set_hook, |
791 | #endif | ||
792 | show_logo, | 786 | show_logo, |
793 | 787 | ||
794 | #ifdef HAVE_WHEEL_POSITION | 788 | #ifdef HAVE_WHEEL_POSITION |
@@ -927,7 +921,6 @@ int plugin_load(const char* plugin, const void* parameter) | |||
927 | touchscreen_set_mode(global_settings.touch_mode); | 921 | touchscreen_set_mode(global_settings.touch_mode); |
928 | #endif | 922 | #endif |
929 | 923 | ||
930 | #ifdef HAVE_LCD_BITMAP | ||
931 | screen_helper_setfont(FONT_UI); | 924 | screen_helper_setfont(FONT_UI); |
932 | #if LCD_DEPTH > 1 | 925 | #if LCD_DEPTH > 1 |
933 | #ifdef HAVE_LCD_COLOR | 926 | #ifdef HAVE_LCD_COLOR |
@@ -939,8 +932,6 @@ int plugin_load(const char* plugin, const void* parameter) | |||
939 | #else /* LCD_DEPTH == 1 */ | 932 | #else /* LCD_DEPTH == 1 */ |
940 | lcd_set_drawmode(DRMODE_SOLID); | 933 | lcd_set_drawmode(DRMODE_SOLID); |
941 | #endif /* LCD_DEPTH */ | 934 | #endif /* LCD_DEPTH */ |
942 | #endif /* HAVE_LCD_BITMAP */ | ||
943 | |||
944 | 935 | ||
945 | #ifdef HAVE_REMOTE_LCD | 936 | #ifdef HAVE_REMOTE_LCD |
946 | #if LCD_REMOTE_DEPTH > 1 | 937 | #if LCD_REMOTE_DEPTH > 1 |