summaryrefslogtreecommitdiff
path: root/apps/plugins/rockblox.c
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2010-06-04 13:22:50 +0000
committerMichael Sevakis <jethead71@rockbox.org>2010-06-04 13:22:50 +0000
commite63e84a5dfb18e9b7eca8dabcd2d58ceac342529 (patch)
tree25989313fa6d7ea9f59ae8bdb1e56fe69f5e1a24 /apps/plugins/rockblox.c
parentbc26fe7a96d6f5e443003cb871dcb4bfba525352 (diff)
downloadrockbox-e63e84a5dfb18e9b7eca8dabcd2d58ceac342529.zip
rockbox-e63e84a5dfb18e9b7eca8dabcd2d58ceac342529.tar.gz
rockbox-e63e84a5dfb18e9b7eca8dabcd2d58ceac342529.tar.bz2
rockbox-e63e84a5dfb18e9b7eca8dabcd2d58ceac342529.tar.xz
Convert some more stuff to mylcd_ and support pgfx as well.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26543 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/rockblox.c')
-rw-r--r--apps/plugins/rockblox.c21
1 files changed, 9 insertions, 12 deletions
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c
index 4e261e4..084eaa5 100644
--- a/apps/plugins/rockblox.c
+++ b/apps/plugins/rockblox.c
@@ -26,6 +26,7 @@
#include "lib/highscore.h"
#include "lib/playback_control.h"
#include "lib/playergfx.h"
+#include "lib/mylcd.h"
PLUGIN_HEADER
@@ -599,8 +600,6 @@ PLUGIN_HEADER
#define LINES_X LABEL_X
#endif
-#define MYLCD(fn) rb->lcd_ ## fn
-
extern const fb_data rockblox_background[];
#else /* HAVE_LCD_CHARCELLS */
@@ -614,8 +613,6 @@ extern const fb_data rockblox_background[];
#define PREVIEW_X 15
#define PREVIEW_Y 1
-#define MYLCD(fn) pgfx_ ## fn
-
#endif
#ifndef _SPACE
@@ -983,14 +980,14 @@ static void refresh_board (void)
#if LCD_DEPTH >= 2
rb->lcd_set_foreground (LCD_BLACK);
#elif LCD_DEPTH == 1
- MYLCD(set_drawmode) (DRMODE_SOLID | DRMODE_INVERSEVID);
+ mylcd_set_drawmode (DRMODE_SOLID | DRMODE_INVERSEVID);
#endif
- MYLCD(fillrect) (BOARD_X, BOARD_Y, BOARD_WIDTH * BLOCK_WIDTH,
- BOARD_HEIGHT * BLOCK_HEIGHT);
+ mylcd_fillrect (BOARD_X, BOARD_Y, BOARD_WIDTH * BLOCK_WIDTH,
+ BOARD_HEIGHT * BLOCK_HEIGHT);
#if LCD_DEPTH == 1
- MYLCD(set_drawmode) (DRMODE_SOLID);
+ mylcd_set_drawmode (DRMODE_SOLID);
#endif
for (i = 0; i < BOARD_WIDTH; i++)
@@ -1067,7 +1064,7 @@ static void refresh_board (void)
pgfx_drawpixel (BOARD_X + x, BOARD_Y + y);
#endif
}
- MYLCD(update) ();
+ mylcd_update ();
}
static bool canMoveTo (int x, int y, int newOrientation)
@@ -1092,14 +1089,14 @@ static void draw_next_block (void)
#if LCD_DEPTH >= 2
rb->lcd_set_foreground (LCD_BLACK);
#elif LCD_DEPTH == 1
- MYLCD(set_drawmode) (DRMODE_SOLID | DRMODE_INVERSEVID);
+ mylcd_set_drawmode (DRMODE_SOLID | DRMODE_INVERSEVID);
#endif
/* 4x4 */
- MYLCD(fillrect) (PREVIEW_X, PREVIEW_Y, BLOCK_WIDTH * 4, BLOCK_HEIGHT * 4);
+ mylcd_fillrect (PREVIEW_X, PREVIEW_Y, BLOCK_WIDTH * 4, BLOCK_HEIGHT * 4);
#if LCD_DEPTH == 1
- MYLCD(set_drawmode) (DRMODE_SOLID);
+ mylcd_set_drawmode (DRMODE_SOLID);
#endif
/* draw the lightgray rectangles */