summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/plugin.c4
-rw-r--r--apps/plugin.h8
-rw-r--r--apps/plugins/lib/playergfx.h3
-rw-r--r--apps/plugins/logo.c4
-rw-r--r--firmware/export/lcd-remote.h3
5 files changed, 14 insertions, 8 deletions
diff --git a/apps/plugin.c b/apps/plugin.c
index 6061e86aa1..58b12fb0b8 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -151,8 +151,8 @@ static const struct plugin_api rockbox_api = {
151 lcd_remote_vline, 151 lcd_remote_vline,
152 lcd_remote_drawrect, 152 lcd_remote_drawrect,
153 lcd_remote_fillrect, 153 lcd_remote_fillrect,
154 lcd_remote_bitmap_part, 154 lcd_remote_mono_bitmap_part,
155 lcd_remote_bitmap, 155 lcd_remote_mono_bitmap,
156 lcd_remote_putsxy, 156 lcd_remote_putsxy,
157 lcd_remote_puts_style, 157 lcd_remote_puts_style,
158 lcd_remote_puts_scroll_style, 158 lcd_remote_puts_scroll_style,
diff --git a/apps/plugin.h b/apps/plugin.h
index 2f724f3d2e..bbef2acb47 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -207,11 +207,11 @@ struct plugin_api {
207 void (*lcd_remote_vline)(int x, int y1, int y2); 207 void (*lcd_remote_vline)(int x, int y1, int y2);
208 void (*lcd_remote_drawrect)(int x, int y, int nx, int ny); 208 void (*lcd_remote_drawrect)(int x, int y, int nx, int ny);
209 void (*lcd_remote_fillrect)(int x, int y, int nx, int ny); 209 void (*lcd_remote_fillrect)(int x, int y, int nx, int ny);
210 void (*lcd_remote_bitmap_part)(const unsigned char *src, int src_x, 210 void (*lcd_remote_mono_bitmap_part)(const unsigned char *src, int src_x,
211 int src_y, int stride, int x, int y, 211 int src_y, int stride, int x, int y,
212 int width, int height);
213 void (*lcd_remote_mono_bitmap)(const unsigned char *src, int x, int y,
212 int width, int height); 214 int width, int height);
213 void (*lcd_remote_bitmap)(const unsigned char *src, int x, int y, int nx,
214 int ny);
215 void (*lcd_remote_putsxy)(int x, int y, const unsigned char *string); 215 void (*lcd_remote_putsxy)(int x, int y, const unsigned char *string);
216 void (*lcd_remote_puts_style)(int x, int y, const unsigned char *str, int style); 216 void (*lcd_remote_puts_style)(int x, int y, const unsigned char *str, int style);
217 void (*lcd_remote_puts_scroll_style)(int x, int y, const unsigned char* string, 217 void (*lcd_remote_puts_scroll_style)(int x, int y, const unsigned char* string,
diff --git a/apps/plugins/lib/playergfx.h b/apps/plugins/lib/playergfx.h
index a0e3973dd4..198d98e4ad 100644
--- a/apps/plugins/lib/playergfx.h
+++ b/apps/plugins/lib/playergfx.h
@@ -45,5 +45,8 @@ void pgfx_bitmap_part(const unsigned char *src, int src_x, int src_y,
45 int stride, int x, int y, int width, int height); 45 int stride, int x, int y, int width, int height);
46void pgfx_bitmap(const unsigned char *src, int x, int y, int width, int height); 46void pgfx_bitmap(const unsigned char *src, int x, int y, int width, int height);
47 47
48#define pgfx_mono_bitmap_part pgfx_bitmap_part
49#define pgfx_mono_bitmap pgfx_bitmap
50
48#endif /* HAVE_LCD_CHARCELLS */ 51#endif /* HAVE_LCD_CHARCELLS */
49#endif /* __PGFX_H__ */ 52#endif /* __PGFX_H__ */
diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c
index ad8b8fd025..baaf46f911 100644
--- a/apps/plugins/logo.c
+++ b/apps/plugins/logo.c
@@ -233,14 +233,14 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) {
233 rb->lcd_mono_bitmap(LOGO, x, y, LOGO_WIDTH, LOGO_HEIGHT); 233 rb->lcd_mono_bitmap(LOGO, x, y, LOGO_WIDTH, LOGO_HEIGHT);
234#ifdef REMOTE_LOGO 234#ifdef REMOTE_LOGO
235 rb->lcd_remote_clear_display(); 235 rb->lcd_remote_clear_display();
236 rb->lcd_remote_bitmap(REMOTE_LOGO, 236 rb->lcd_remote_mono_bitmap(REMOTE_LOGO,
237 (x * (REMOTE_WIDTH - REMOTE_LOGO_WIDTH)) / (DISPLAY_WIDTH - LOGO_WIDTH), 237 (x * (REMOTE_WIDTH - REMOTE_LOGO_WIDTH)) / (DISPLAY_WIDTH - LOGO_WIDTH),
238 (y * (REMOTE_HEIGHT - REMOTE_LOGO_HEIGHT)) / (DISPLAY_HEIGHT - LOGO_HEIGHT), 238 (y * (REMOTE_HEIGHT - REMOTE_LOGO_HEIGHT)) / (DISPLAY_HEIGHT - LOGO_HEIGHT),
239 REMOTE_LOGO_WIDTH, REMOTE_LOGO_HEIGHT); 239 REMOTE_LOGO_WIDTH, REMOTE_LOGO_HEIGHT);
240#endif 240#endif
241#else 241#else
242 pgfx_clear_display(); 242 pgfx_clear_display();
243 pgfx_bitmap(LOGO, x % 5, y, LOGO_WIDTH, LOGO_HEIGHT); 243 pgfx_mono_bitmap(LOGO, x % 5, y, LOGO_WIDTH, LOGO_HEIGHT);
244 cpos = x / 5; 244 cpos = x / 5;
245#endif 245#endif
246 246
diff --git a/firmware/export/lcd-remote.h b/firmware/export/lcd-remote.h
index 17025a7421..f2285026c1 100644
--- a/firmware/export/lcd-remote.h
+++ b/firmware/export/lcd-remote.h
@@ -86,5 +86,8 @@ extern void lcd_remote_invertscroll(int x, int y);
86extern void lcd_remote_bidir_scroll(int threshold); 86extern void lcd_remote_bidir_scroll(int threshold);
87extern void lcd_remote_scroll_step(int pixels); 87extern void lcd_remote_scroll_step(int pixels);
88 88
89#define lcd_remote_mono_bitmap lcd_remote_bitmap
90#define lcd_remote_mono_bitmap_part lcd_remote_bitmap_part
91
89#endif 92#endif
90#endif 93#endif