From 539c513fe60f9277105edb1916685594338ac671 Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Mon, 16 Apr 2007 23:55:19 +0000 Subject: Temporary fix for remote bitmap functions in the multi-screen API. Fixed icon.c to use this. Also fixed crash due to missing assignment of lcd_bitmap[_part] for monochrome main LCDs. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13187 a1c6a512-1295-4272-9138-f99709370657 --- apps/screen_access.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) (limited to 'apps/screen_access.c') diff --git a/apps/screen_access.c b/apps/screen_access.c index 03687a3dbb..a642b65d20 100644 --- a/apps/screen_access.c +++ b/apps/screen_access.c @@ -52,7 +52,15 @@ void screen_init(struct screen * screen, enum screen_type screen_type) screen->setfont(FONT_UI); screen->mono_bitmap=&lcd_remote_mono_bitmap; screen->mono_bitmap_part=&lcd_remote_mono_bitmap_part; + screen->bitmap=(screen_bitmap_func*)&lcd_remote_bitmap; + screen->bitmap_part=(screen_bitmap_part_func*)&lcd_remote_bitmap_part; screen->set_drawmode=&lcd_remote_set_drawmode; +#if LCD_DEPTH <= 2 + /* No transparency yet for grayscale and mono lcd */ + screen->transparent_bitmap=(screen_bitmap_func*)&lcd_remote_bitmap; + screen->transparent_bitmap_part=(screen_bitmap_part_func*)&lcd_remote_bitmap_part; + /* No colour remotes yet */ +#endif #if LCD_REMOTE_DEPTH > 1 #if defined(HAVE_LCD_COLOR) screen->color_to_native=&lcd_remote_color_to_native; @@ -122,17 +130,17 @@ void screen_init(struct screen * screen, enum screen_type screen_type) screen->mono_bitmap=&lcd_mono_bitmap; screen->mono_bitmap_part=&lcd_mono_bitmap_part; screen->set_drawmode=&lcd_set_drawmode; -#if LCD_DEPTH > 1 - screen->bitmap=&lcd_bitmap; - screen->bitmap_part=&lcd_bitmap_part; -#if LCD_DEPTH == 2 - /* No transparency yet for grayscale lcd */ - screen->transparent_bitmap=&lcd_bitmap; - screen->transparent_bitmap_part=&lcd_bitmap_part; + screen->bitmap=(screen_bitmap_func*)&lcd_bitmap; + screen->bitmap_part=(screen_bitmap_part_func*)&lcd_bitmap_part; +#if LCD_DEPTH <= 2 + /* No transparency yet for grayscale and mono lcd */ + screen->transparent_bitmap=(screen_bitmap_func*)&lcd_bitmap; + screen->transparent_bitmap_part=(screen_bitmap_part_func*)&lcd_bitmap_part; #else - screen->transparent_bitmap=&lcd_bitmap_transparent; - screen->transparent_bitmap_part=&lcd_bitmap_transparent_part; + screen->transparent_bitmap=(screen_bitmap_func*)&lcd_bitmap_transparent; + screen->transparent_bitmap_part=(screen_bitmap_part_func*)&lcd_bitmap_transparent_part; #endif +#if LCD_DEPTH > 1 #if defined(HAVE_LCD_COLOR) && defined(LCD_REMOTE_DEPTH) && LCD_REMOTE_DEPTH > 1 screen->color_to_native=&lcd_color_to_native; #endif -- cgit v1.2.3