Adapted remote LCD driver and player graphics library to the new bitmap function naming scheme.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7047 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
f894a4c269
commit
d7f9439353
5 changed files with 14 additions and 8 deletions
|
@ -151,8 +151,8 @@ static const struct plugin_api rockbox_api = {
|
||||||
lcd_remote_vline,
|
lcd_remote_vline,
|
||||||
lcd_remote_drawrect,
|
lcd_remote_drawrect,
|
||||||
lcd_remote_fillrect,
|
lcd_remote_fillrect,
|
||||||
lcd_remote_bitmap_part,
|
lcd_remote_mono_bitmap_part,
|
||||||
lcd_remote_bitmap,
|
lcd_remote_mono_bitmap,
|
||||||
lcd_remote_putsxy,
|
lcd_remote_putsxy,
|
||||||
lcd_remote_puts_style,
|
lcd_remote_puts_style,
|
||||||
lcd_remote_puts_scroll_style,
|
lcd_remote_puts_scroll_style,
|
||||||
|
|
|
@ -207,11 +207,11 @@ struct plugin_api {
|
||||||
void (*lcd_remote_vline)(int x, int y1, int y2);
|
void (*lcd_remote_vline)(int x, int y1, int y2);
|
||||||
void (*lcd_remote_drawrect)(int x, int y, int nx, int ny);
|
void (*lcd_remote_drawrect)(int x, int y, int nx, int ny);
|
||||||
void (*lcd_remote_fillrect)(int x, int y, int nx, int ny);
|
void (*lcd_remote_fillrect)(int x, int y, int nx, int ny);
|
||||||
void (*lcd_remote_bitmap_part)(const unsigned char *src, int src_x,
|
void (*lcd_remote_mono_bitmap_part)(const unsigned char *src, int src_x,
|
||||||
int src_y, int stride, int x, int y,
|
int src_y, int stride, int x, int y,
|
||||||
int width, int height);
|
int width, int height);
|
||||||
void (*lcd_remote_bitmap)(const unsigned char *src, int x, int y, int nx,
|
void (*lcd_remote_mono_bitmap)(const unsigned char *src, int x, int y,
|
||||||
int ny);
|
int width, int height);
|
||||||
void (*lcd_remote_putsxy)(int x, int y, const unsigned char *string);
|
void (*lcd_remote_putsxy)(int x, int y, const unsigned char *string);
|
||||||
void (*lcd_remote_puts_style)(int x, int y, const unsigned char *str, int style);
|
void (*lcd_remote_puts_style)(int x, int y, const unsigned char *str, int style);
|
||||||
void (*lcd_remote_puts_scroll_style)(int x, int y, const unsigned char* string,
|
void (*lcd_remote_puts_scroll_style)(int x, int y, const unsigned char* string,
|
||||||
|
|
|
@ -45,5 +45,8 @@ void pgfx_bitmap_part(const unsigned char *src, int src_x, int src_y,
|
||||||
int stride, int x, int y, int width, int height);
|
int stride, int x, int y, int width, int height);
|
||||||
void pgfx_bitmap(const unsigned char *src, int x, int y, int width, int height);
|
void pgfx_bitmap(const unsigned char *src, int x, int y, int width, int height);
|
||||||
|
|
||||||
|
#define pgfx_mono_bitmap_part pgfx_bitmap_part
|
||||||
|
#define pgfx_mono_bitmap pgfx_bitmap
|
||||||
|
|
||||||
#endif /* HAVE_LCD_CHARCELLS */
|
#endif /* HAVE_LCD_CHARCELLS */
|
||||||
#endif /* __PGFX_H__ */
|
#endif /* __PGFX_H__ */
|
||||||
|
|
|
@ -233,14 +233,14 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) {
|
||||||
rb->lcd_mono_bitmap(LOGO, x, y, LOGO_WIDTH, LOGO_HEIGHT);
|
rb->lcd_mono_bitmap(LOGO, x, y, LOGO_WIDTH, LOGO_HEIGHT);
|
||||||
#ifdef REMOTE_LOGO
|
#ifdef REMOTE_LOGO
|
||||||
rb->lcd_remote_clear_display();
|
rb->lcd_remote_clear_display();
|
||||||
rb->lcd_remote_bitmap(REMOTE_LOGO,
|
rb->lcd_remote_mono_bitmap(REMOTE_LOGO,
|
||||||
(x * (REMOTE_WIDTH - REMOTE_LOGO_WIDTH)) / (DISPLAY_WIDTH - LOGO_WIDTH),
|
(x * (REMOTE_WIDTH - REMOTE_LOGO_WIDTH)) / (DISPLAY_WIDTH - LOGO_WIDTH),
|
||||||
(y * (REMOTE_HEIGHT - REMOTE_LOGO_HEIGHT)) / (DISPLAY_HEIGHT - LOGO_HEIGHT),
|
(y * (REMOTE_HEIGHT - REMOTE_LOGO_HEIGHT)) / (DISPLAY_HEIGHT - LOGO_HEIGHT),
|
||||||
REMOTE_LOGO_WIDTH, REMOTE_LOGO_HEIGHT);
|
REMOTE_LOGO_WIDTH, REMOTE_LOGO_HEIGHT);
|
||||||
#endif
|
#endif
|
||||||
#else
|
#else
|
||||||
pgfx_clear_display();
|
pgfx_clear_display();
|
||||||
pgfx_bitmap(LOGO, x % 5, y, LOGO_WIDTH, LOGO_HEIGHT);
|
pgfx_mono_bitmap(LOGO, x % 5, y, LOGO_WIDTH, LOGO_HEIGHT);
|
||||||
cpos = x / 5;
|
cpos = x / 5;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -86,5 +86,8 @@ extern void lcd_remote_invertscroll(int x, int y);
|
||||||
extern void lcd_remote_bidir_scroll(int threshold);
|
extern void lcd_remote_bidir_scroll(int threshold);
|
||||||
extern void lcd_remote_scroll_step(int pixels);
|
extern void lcd_remote_scroll_step(int pixels);
|
||||||
|
|
||||||
|
#define lcd_remote_mono_bitmap lcd_remote_bitmap
|
||||||
|
#define lcd_remote_mono_bitmap_part lcd_remote_bitmap_part
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue