summaryrefslogtreecommitdiff
path: root/apps/plugins/jpeg.c
diff options
context:
space:
mode:
authorDave Chapman <dave@dchapman.com>2006-02-05 19:27:23 +0000
committerDave Chapman <dave@dchapman.com>2006-02-05 19:27:23 +0000
commitd350e80b40a655e79a4f073fe35d126fc91e960c (patch)
tree856713cc45e82ecfe78beb8164a0730e7bfddf4a /apps/plugins/jpeg.c
parentfa743560832c0e2f5634c7dde1763ae66f143c56 (diff)
downloadrockbox-d350e80b40a655e79a4f073fe35d126fc91e960c.zip
rockbox-d350e80b40a655e79a4f073fe35d126fc91e960c.tar.gz
rockbox-d350e80b40a655e79a4f073fe35d126fc91e960c.tar.bz2
rockbox-d350e80b40a655e79a4f073fe35d126fc91e960c.tar.xz
iPod: Make the plugins compile on the iPod 4G grayscale
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8588 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/jpeg.c')
-rw-r--r--apps/plugins/jpeg.c42
1 files changed, 33 insertions, 9 deletions
diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c
index 468f745..78bcd9f 100644
--- a/apps/plugins/jpeg.c
+++ b/apps/plugins/jpeg.c
@@ -35,15 +35,39 @@ PLUGIN_HEADER
#if CONFIG_KEYPAD == RECORDER_PAD
#define JPEG_ZOOM_IN BUTTON_PLAY
#define JPEG_ZOOM_OUT BUTTON_ON
+#define JPEG_UP BUTTON_UP
+#define JPEG_DOWN BUTTON_DOWN
+#define JPEG_LEFT BUTTON_LEFT
+#define JPEG_RIGHT BUTTON_RIGHT
+#define JPEG_QUIT BUTTON_OFF
#elif CONFIG_KEYPAD == ONDIO_PAD
#define JPEG_ZOOM_PRE BUTTON_MENU
#define JPEG_ZOOM_IN (BUTTON_MENU | BUTTON_REL)
#define JPEG_ZOOM_OUT (BUTTON_MENU | BUTTON_REPEAT)
+#define JPEG_UP BUTTON_UP
+#define JPEG_DOWN BUTTON_DOWN
+#define JPEG_LEFT BUTTON_LEFT
+#define JPEG_RIGHT BUTTON_RIGHT
+#define JPEG_QUIT BUTTON_OFF
#elif CONFIG_KEYPAD == IRIVER_H100_PAD
#define JPEG_ZOOM_IN BUTTON_SELECT
#define JPEG_ZOOM_OUT BUTTON_MODE
+#define JPEG_UP BUTTON_UP
+#define JPEG_DOWN BUTTON_DOWN
+#define JPEG_LEFT BUTTON_LEFT
+#define JPEG_RIGHT BUTTON_RIGHT
+#define JPEG_QUIT BUTTON_OFF
+
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD)
+#define JPEG_ZOOM_IN BUTTON_SCROLL_FWD
+#define JPEG_ZOOM_OUT BUTTON_SCROLL_BACK
+#define JPEG_UP BUTTON_MENU
+#define JPEG_DOWN BUTTON_PLAY
+#define JPEG_LEFT BUTTON_LEFT
+#define JPEG_RIGHT BUTTON_RIGHT
+#define JPEG_QUIT BUTTON_SELECT
#endif
@@ -1541,8 +1565,8 @@ int scroll_bmp(struct t_disp* pdisp)
switch(button)
{
- case BUTTON_LEFT:
- case BUTTON_LEFT | BUTTON_REPEAT:
+ case JPEG_LEFT:
+ case JPEG_LEFT | BUTTON_REPEAT:
move = MIN(HSCROLL, pdisp->x);
if (move > 0)
{
@@ -1555,8 +1579,8 @@ int scroll_bmp(struct t_disp* pdisp)
}
break;
- case BUTTON_RIGHT:
- case BUTTON_RIGHT | BUTTON_REPEAT:
+ case JPEG_RIGHT:
+ case JPEG_RIGHT | BUTTON_REPEAT:
move = MIN(HSCROLL, pdisp->width - pdisp->x - LCD_WIDTH);
if (move > 0)
{
@@ -1570,8 +1594,8 @@ int scroll_bmp(struct t_disp* pdisp)
}
break;
- case BUTTON_UP:
- case BUTTON_UP | BUTTON_REPEAT:
+ case JPEG_UP:
+ case JPEG_UP | BUTTON_REPEAT:
move = MIN(VSCROLL, pdisp->y);
if (move > 0)
{
@@ -1584,8 +1608,8 @@ int scroll_bmp(struct t_disp* pdisp)
}
break;
- case BUTTON_DOWN:
- case BUTTON_DOWN | BUTTON_REPEAT:
+ case JPEG_DOWN:
+ case JPEG_DOWN | BUTTON_REPEAT:
move = MIN(VSCROLL, pdisp->height - pdisp->y - LCD_HEIGHT);
if (move > 0)
{
@@ -1615,7 +1639,7 @@ int scroll_bmp(struct t_disp* pdisp)
return ZOOM_OUT;
break;
- case BUTTON_OFF:
+ case JPEG_QUIT:
return PLUGIN_OK;
default: