devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Convert some more stuff to mylcd_ and support pgfx as well.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26543 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis 2010-06-04 13:22:50 +00:00
parent bc26fe7a96
commit e63e84a5df
16 changed files with 224 additions and 214 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/plugins/imageviewer/bmp/bmp.c
View file

@ -119,7 +119,7 @@ void draw_image_rect(struct image_info *info,
y + MAX(0, (LCD_HEIGHT-info->height)/2),
width, height);
#else
MYXLCD(gray_bitmap_part)(
mylcd_ub_gray_bitmap_part(
pdisp->bitmap, info->x + x, info->y + y, info->width,
x + MAX(0, (LCD_WIDTH-info->width)/2),
y + MAX(0, (LCD_HEIGHT-info->height)/2),

22
apps/plugins/imageviewer/imageviewer.c
View file

@ -416,10 +416,10 @@ static void pan_view_right(struct image_info *info)
move = MIN(HSCROLL, info->width - info->x - LCD_WIDTH);
if (move > 0)
{
MYXLCD(scroll_left)(move); /* scroll left */
mylcd_ub_scroll_left(move); /* scroll left */
info->x += move;
draw_image_rect(info, LCD_WIDTH - move, 0, move, info->height-info->y);
MYLCD_UPDATE();
mylcd_ub_update();
}
}
@ -432,10 +432,10 @@ static void pan_view_left(struct image_info *info)
move = MIN(HSCROLL, info->x);
if (move > 0)
{
MYXLCD(scroll_right)(move); /* scroll right */
mylcd_ub_scroll_right(move); /* scroll right */
info->x -= move;
draw_image_rect(info, 0, 0, move, info->height-info->y);
MYLCD_UPDATE();
mylcd_ub_update();
}
}
@ -448,7 +448,7 @@ static void pan_view_up(struct image_info *info)
move = MIN(VSCROLL, info->y);
if (move > 0)
{
MYXLCD(scroll_down)(move); /* scroll down */
mylcd_ub_scroll_down(move); /* scroll down */
info->y -= move;
#if defined(HAVE_LCD_COLOR) && defined(JPEG_VIEWER)
if (settings.jpeg_dither_mode == DITHER_DIFFUSION)
@ -459,7 +459,7 @@ static void pan_view_up(struct image_info *info)
}
#endif
draw_image_rect(info, 0, 0, info->width-info->x, move);
MYLCD_UPDATE();
mylcd_ub_update();
}
}
@ -472,7 +472,7 @@ static void pan_view_down(struct image_info *info)
move = MIN(VSCROLL, info->height - info->y - LCD_HEIGHT);
if (move > 0)
{
MYXLCD(scroll_up)(move); /* scroll up */
mylcd_ub_scroll_up(move); /* scroll up */
info->y += move;
#if defined(HAVE_LCD_COLOR) && defined(JPEG_VIEWER)
if (settings.jpeg_dither_mode == DITHER_DIFFUSION)
@ -499,7 +499,7 @@ static void pan_view_down(struct image_info *info)
info->y++;
}
#endif
MYLCD_UPDATE();
mylcd_ub_update();
}
}
@ -611,7 +611,7 @@ static int scroll_bmp(struct image_info *info)
#else
draw_image_rect(info, 0, 0,
info->width-info->x, info->height-info->y);
MYLCD_UPDATE();
mylcd_ub_update();
#endif
break;
@ -783,10 +783,10 @@ static int load_and_show(char* filename, struct image_info *info)
rb->lcd_update();
}
MYLCD(clear_display)();
mylcd_ub_clear_display();
draw_image_rect(info, 0, 0,
info->width-info->x, info->height-info->y);
MYLCD_UPDATE();
mylcd_ub_update();
#ifdef USEGSLIB
grey_show(true); /* switch on greyscale overlay */

8
apps/plugins/imageviewer/imageviewer.h
View file

@ -366,16 +366,12 @@
#if LCD_DEPTH < 8
#define USEGSLIB
#include <lib/grey.h>
#define MYLCD(fn) grey_ub_ ## fn
#define MYLCD_UPDATE()
#define MYXLCD(fn) grey_ub_ ## fn
#else
#include <lib/xlcd.h>
#define MYLCD(fn) rb->lcd_ ## fn
#define MYLCD_UPDATE() rb->lcd_update();
#define MYXLCD(fn) xlcd_ ## fn
#endif
#include <lib/mylcd.h>
/* Min memory allowing us to use the plugin buffer
* and thus not stopping the music
* *Very* rough estimation:

2
apps/plugins/imageviewer/jpeg/jpeg.c
View file

@ -94,7 +94,7 @@ void draw_image_rect(struct image_info *info,
width, height,
settings.jpeg_colour_mode, settings.jpeg_dither_mode);
#else
MYXLCD(gray_bitmap_part)(
mylcd_ub_gray_bitmap_part(
pdisp->bitmap[0], info->x + x, info->y + y, pdisp->stride,
x + MAX(0, (LCD_WIDTH-info->width)/2),
y + MAX(0, (LCD_HEIGHT-info->height)/2),