Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move get_codepage_name() back out of #ifdef HAVE_LCD_BITMAP

Browse source 
55eb1c54 accidentally put it there.

Change-Id: I25d1984f7d4a1e6d65d23aafab5eefea4f92322e
This commit is contained in:
Frank Gevaerts 2019-07-20 22:06:30 +02:00
parent 4d2874fd3d
commit 859f762814
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/plugin.c
View file

@ -262,10 +262,7 @@ static const struct plugin_api rockbox_api = {
&button_queue, &button_queue,
#endif #endif
bidi_l2v, bidi_l2v,
#ifdef HAVE_LCD_BITMAP
is_diacritic, is_diacritic,
get_codepage_name,
#endif
font_get_bits, font_get_bits,
font_load, font_load,
font_unload, font_unload,
@ -275,6 +272,7 @@ static const struct plugin_api rockbox_api = {
screen_clear_area, screen_clear_area,
gui_scrollbar_draw, gui_scrollbar_draw,
#endif /* HAVE_LCD_BITMAP */ #endif /* HAVE_LCD_BITMAP */
get_codepage_name,
#ifdef HAVE_REMOTE_LCD #ifdef HAVE_REMOTE_LCD
/* remote lcd */ /* remote lcd */

8
apps/plugin.h
View file

@ -161,12 +161,12 @@ void* plugin_get_buffer(size_t *buffer_size);
#define PLUGIN_MAGIC 0x526F634B /* RocK */ #define PLUGIN_MAGIC 0x526F634B /* RocK */
/* increase this every time the api struct changes */ /* increase this every time the api struct changes */
#define PLUGIN_API_VERSION 236 #define PLUGIN_API_VERSION 237
/* update this to latest version if a change to the api struct breaks /* update this to latest version if a change to the api struct breaks
backwards compatibility (and please take the opportunity to sort in any backwards compatibility (and please take the opportunity to sort in any
new function which are "waiting" at the end of the function table) */ new function which are "waiting" at the end of the function table) */
#define PLUGIN_MIN_API_VERSION 236 #define PLUGIN_MIN_API_VERSION 237
/* plugin return codes */ /* plugin return codes */
/* internal returns start at 0x100 to make exit(1..255) work */ /* internal returns start at 0x100 to make exit(1..255) work */
@ -288,10 +288,7 @@ struct plugin_api {
struct event_queue *button_queue; struct event_queue *button_queue;
#endif #endif
unsigned short *(*bidi_l2v)( const unsigned char *str, int orientation ); unsigned short *(*bidi_l2v)( const unsigned char *str, int orientation );
#ifdef HAVE_LCD_BITMAP
bool (*is_diacritic)(const unsigned short char_code, bool *is_rtl); bool (*is_diacritic)(const unsigned short char_code, bool *is_rtl);
const char* (*get_codepage_name)(int cp);
#endif
const unsigned char *(*font_get_bits)( struct font *pf, unsigned short char_code ); const unsigned char *(*font_get_bits)( struct font *pf, unsigned short char_code );
int (*font_load)(const char *path); int (*font_load)(const char *path);
void (*font_unload)(int font_id); void (*font_unload)(int font_id);
@ -306,6 +303,7 @@ struct plugin_api {
int min_shown, int max_shown, int min_shown, int max_shown,
unsigned flags); unsigned flags);
#endif /* HAVE_LCD_BITMAP */ #endif /* HAVE_LCD_BITMAP */
const char* (*get_codepage_name)(int cp);
#ifdef HAVE_REMOTE_LCD #ifdef HAVE_REMOTE_LCD
/* remote lcd */ /* remote lcd */