From d7f94393533a47597e3786b2687877f2b601b3d4 Mon Sep 17 00:00:00 2001
From: Jens Arnold <amiconn@rockbox.org>
Date: Thu, 7 Jul 2005 00:05:29 +0000
Subject: [PATCH] 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
---
 apps/plugin.c                | 4 ++--
 apps/plugin.h                | 8 ++++----
 apps/plugins/lib/playergfx.h | 3 +++
 apps/plugins/logo.c          | 4 ++--
 firmware/export/lcd-remote.h | 3 +++
 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 = {
     lcd_remote_vline,
     lcd_remote_drawrect,
     lcd_remote_fillrect,
-    lcd_remote_bitmap_part,
-    lcd_remote_bitmap,
+    lcd_remote_mono_bitmap_part,
+    lcd_remote_mono_bitmap,
     lcd_remote_putsxy,
     lcd_remote_puts_style,
     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 {
     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_fillrect)(int x, int y, int nx, int ny);
-    void (*lcd_remote_bitmap_part)(const unsigned char *src, int src_x,
-                                   int src_y, int stride, int x, int y,
+    void (*lcd_remote_mono_bitmap_part)(const unsigned char *src, int src_x,
+                                        int src_y, int stride, int x, int y,
+                                        int width, int height);
+    void (*lcd_remote_mono_bitmap)(const unsigned char *src, int x, int y,
                                    int width, int height);
-    void (*lcd_remote_bitmap)(const unsigned char *src, int x, int y, int nx,
-                              int ny);
     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_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,
                       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);
 
+#define pgfx_mono_bitmap_part pgfx_bitmap_part
+#define pgfx_mono_bitmap pgfx_bitmap
+
 #endif /* HAVE_LCD_CHARCELLS */
 #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) {
         rb->lcd_mono_bitmap(LOGO, x, y, LOGO_WIDTH, LOGO_HEIGHT);
 #ifdef REMOTE_LOGO
         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),
                 (y * (REMOTE_HEIGHT - REMOTE_LOGO_HEIGHT)) / (DISPLAY_HEIGHT - LOGO_HEIGHT),
                 REMOTE_LOGO_WIDTH, REMOTE_LOGO_HEIGHT);
 #endif
 #else
         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;
 #endif
 
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);
 extern void lcd_remote_bidir_scroll(int threshold);
 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