From 2dd518a59b0c815247f97d061bfe338fc40bd792 Mon Sep 17 00:00:00 2001 From: Linus Nielsen Feltzing Date: Mon, 14 Nov 2005 20:46:48 +0000 Subject: H300 logo git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7878 a1c6a512-1295-4272-9138-f99709370657 --- apps/SOURCES | 3 +++ apps/misc.c | 4 +++- apps/recorder/icons.h | 6 +++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/apps/SOURCES b/apps/SOURCES index 6b2b68236b..ebd4a27f2a 100644 --- a/apps/SOURCES +++ b/apps/SOURCES @@ -52,6 +52,9 @@ recorder/icons.c recorder/keyboard.c recorder/peakmeter.c recorder/widgets.c +#ifdef IRIVER_H300_SERIES +recorder/logo-h300.c +#endif #endif #ifdef CONFIG_TUNER recorder/radio.c diff --git a/apps/misc.c b/apps/misc.c index c29c71e69e..4b43e0a0b8 100644 --- a/apps/misc.c +++ b/apps/misc.c @@ -557,7 +557,9 @@ int show_logo( void ) #if LCD_WIDTH == 112 || LCD_WIDTH == 128 lcd_bitmap(rockbox112x37, 0, 10, 112, 37); #endif -#if LCD_WIDTH >= 160 +#if (LCD_WIDTH >= 220) && defined(HAVE_LCD_COLOR) + lcd_bitmap(rockboxlogo, 0, 10, ROCKBOXLOGO_WIDTH, ROCKBOXLOGO_HEIGHT); +#elif LCD_WIDTH >= 160 lcd_bitmap(rockbox160x53x2, 0, 10, 160, 53); #endif diff --git a/apps/recorder/icons.h b/apps/recorder/icons.h index 17605ef490..21198fc985 100644 --- a/apps/recorder/icons.h +++ b/apps/recorder/icons.h @@ -77,7 +77,11 @@ extern const unsigned char bitmap_icon_disk[]; #if LCD_WIDTH == 112 || LCD_WIDTH == 128 || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_WIDTH == 128) extern const unsigned char rockbox112x37[]; #endif -#if LCD_WIDTH >= 160 +#ifdef IRIVER_H300_SERIES +#define ROCKBOXLOGO_WIDTH 220 +#define ROCKBOXLOGO_HEIGHT 68 +extern const unsigned short rockboxlogo[]; +#elif LCD_WIDTH >= 160 extern const unsigned char rockbox160x53x2[]; #endif -- cgit v1.2.3