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.h | |
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.h')
-rw-r--r-- | apps/plugin.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/apps/plugin.h b/apps/plugin.h index 41f65947a3..2fe40535ec 100644 --- a/apps/plugin.h +++ b/apps/plugin.h | |||
@@ -89,12 +89,10 @@ void* plugin_get_buffer(size_t *buffer_size); | |||
89 | #include "settings.h" | 89 | #include "settings.h" |
90 | #include "timer.h" | 90 | #include "timer.h" |
91 | #include "playlist.h" | 91 | #include "playlist.h" |
92 | #ifdef HAVE_LCD_BITMAP | ||
93 | #include "screendump.h" | 92 | #include "screendump.h" |
94 | #include "scrollbar.h" | 93 | #include "scrollbar.h" |
95 | #include "jpeg_load.h" | 94 | #include "jpeg_load.h" |
96 | #include "../recorder/bmp.h" | 95 | #include "../recorder/bmp.h" |
97 | #endif | ||
98 | #include "statusbar.h" | 96 | #include "statusbar.h" |
99 | #include "menu.h" | 97 | #include "menu.h" |
100 | #include "rbunicode.h" | 98 | #include "rbunicode.h" |
@@ -156,12 +154,12 @@ void* plugin_get_buffer(size_t *buffer_size); | |||
156 | #define PLUGIN_MAGIC 0x526F634B /* RocK */ | 154 | #define PLUGIN_MAGIC 0x526F634B /* RocK */ |
157 | 155 | ||
158 | /* increase this every time the api struct changes */ | 156 | /* increase this every time the api struct changes */ |
159 | #define PLUGIN_API_VERSION 238 | 157 | #define PLUGIN_API_VERSION 239 |
160 | 158 | ||
161 | /* update this to latest version if a change to the api struct breaks | 159 | /* update this to latest version if a change to the api struct breaks |
162 | backwards compatibility (and please take the opportunity to sort in any | 160 | backwards compatibility (and please take the opportunity to sort in any |
163 | new function which are "waiting" at the end of the function table) */ | 161 | new function which are "waiting" at the end of the function table) */ |
164 | #define PLUGIN_MIN_API_VERSION 238 | 162 | #define PLUGIN_MIN_API_VERSION 239 |
165 | 163 | ||
166 | /* plugin return codes */ | 164 | /* plugin return codes */ |
167 | /* internal returns start at 0x100 to make exit(1..255) work */ | 165 | /* internal returns start at 0x100 to make exit(1..255) work */ |
@@ -331,13 +329,11 @@ struct plugin_api { | |||
331 | 329 | ||
332 | void (*viewport_set_defaults)(struct viewport *vp, | 330 | void (*viewport_set_defaults)(struct viewport *vp, |
333 | const enum screen_type screen); | 331 | const enum screen_type screen); |
334 | #ifdef HAVE_LCD_BITMAP | ||
335 | void (*viewportmanager_theme_enable)(enum screen_type screen, bool enable, | 332 | void (*viewportmanager_theme_enable)(enum screen_type screen, bool enable, |
336 | struct viewport *viewport); | 333 | struct viewport *viewport); |
337 | void (*viewportmanager_theme_undo)(enum screen_type screen, bool force_redraw); | 334 | void (*viewportmanager_theme_undo)(enum screen_type screen, bool force_redraw); |
338 | void (*viewport_set_fullscreen)(struct viewport *vp, | 335 | void (*viewport_set_fullscreen)(struct viewport *vp, |
339 | const enum screen_type screen); | 336 | const enum screen_type screen); |
340 | #endif | ||
341 | 337 | ||
342 | #ifdef HAVE_BACKLIGHT | 338 | #ifdef HAVE_BACKLIGHT |
343 | /* lcd backlight */ | 339 | /* lcd backlight */ |
@@ -597,7 +593,7 @@ struct plugin_api { | |||
597 | 593 | ||
598 | #if (CONFIG_PLATFORM & PLATFORM_HOSTED) | 594 | #if (CONFIG_PLATFORM & PLATFORM_HOSTED) |
599 | /* special simulator hooks */ | 595 | /* special simulator hooks */ |
600 | #if defined(HAVE_LCD_BITMAP) && LCD_DEPTH < 8 | 596 | #if LCD_DEPTH < 8 |
601 | void (*sim_lcd_ex_init)(unsigned long (*getpixel)(int, int)); | 597 | void (*sim_lcd_ex_init)(unsigned long (*getpixel)(int, int)); |
602 | void (*sim_lcd_ex_update_rect)(int x, int y, int width, int height); | 598 | void (*sim_lcd_ex_update_rect)(int x, int y, int width, int height); |
603 | #endif | 599 | #endif |
@@ -900,7 +896,6 @@ struct plugin_api { | |||
900 | int count, | 896 | int count, |
901 | bool signd); | 897 | bool signd); |
902 | 898 | ||
903 | #ifdef HAVE_LCD_BITMAP | ||
904 | int (*read_bmp_file)(const char* filename, struct bitmap *bm, int maxsize, | 899 | int (*read_bmp_file)(const char* filename, struct bitmap *bm, int maxsize, |
905 | int format, const struct custom_format *cformat); | 900 | int format, const struct custom_format *cformat); |
906 | int (*read_bmp_fd)(int fd, struct bitmap *bm, int maxsize, | 901 | int (*read_bmp_fd)(int fd, struct bitmap *bm, int maxsize, |
@@ -912,7 +907,6 @@ struct plugin_api { | |||
912 | int format, const struct custom_format *cformat); | 907 | int format, const struct custom_format *cformat); |
913 | #endif | 908 | #endif |
914 | void (*screen_dump_set_hook)(void (*hook)(int fh)); | 909 | void (*screen_dump_set_hook)(void (*hook)(int fh)); |
915 | #endif | ||
916 | int (*show_logo)(void); | 910 | int (*show_logo)(void); |
917 | 911 | ||
918 | #ifdef HAVE_WHEEL_POSITION | 912 | #ifdef HAVE_WHEEL_POSITION |