diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2005-11-14 20:46:48 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2005-11-14 20:46:48 +0000 |
commit | 2dd518a59b0c815247f97d061bfe338fc40bd792 (patch) | |
tree | 06fa5b370d2d750c6d2761282424ba3d7c849494 /apps | |
parent | b1b3a12e763b7bd169e1e0903b606d6cd64fe19a (diff) | |
download | rockbox-2dd518a59b0c815247f97d061bfe338fc40bd792.tar.gz rockbox-2dd518a59b0c815247f97d061bfe338fc40bd792.zip |
H300 logo
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7878 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/SOURCES | 3 | ||||
-rw-r--r-- | apps/misc.c | 4 | ||||
-rw-r--r-- | 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 | |||
52 | recorder/keyboard.c | 52 | recorder/keyboard.c |
53 | recorder/peakmeter.c | 53 | recorder/peakmeter.c |
54 | recorder/widgets.c | 54 | recorder/widgets.c |
55 | #ifdef IRIVER_H300_SERIES | ||
56 | recorder/logo-h300.c | ||
57 | #endif | ||
55 | #endif | 58 | #endif |
56 | #ifdef CONFIG_TUNER | 59 | #ifdef CONFIG_TUNER |
57 | recorder/radio.c | 60 | 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 ) | |||
557 | #if LCD_WIDTH == 112 || LCD_WIDTH == 128 | 557 | #if LCD_WIDTH == 112 || LCD_WIDTH == 128 |
558 | lcd_bitmap(rockbox112x37, 0, 10, 112, 37); | 558 | lcd_bitmap(rockbox112x37, 0, 10, 112, 37); |
559 | #endif | 559 | #endif |
560 | #if LCD_WIDTH >= 160 | 560 | #if (LCD_WIDTH >= 220) && defined(HAVE_LCD_COLOR) |
561 | lcd_bitmap(rockboxlogo, 0, 10, ROCKBOXLOGO_WIDTH, ROCKBOXLOGO_HEIGHT); | ||
562 | #elif LCD_WIDTH >= 160 | ||
561 | lcd_bitmap(rockbox160x53x2, 0, 10, 160, 53); | 563 | lcd_bitmap(rockbox160x53x2, 0, 10, 160, 53); |
562 | #endif | 564 | #endif |
563 | 565 | ||
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[]; | |||
77 | #if LCD_WIDTH == 112 || LCD_WIDTH == 128 || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_WIDTH == 128) | 77 | #if LCD_WIDTH == 112 || LCD_WIDTH == 128 || (defined(HAVE_REMOTE_LCD) && LCD_REMOTE_WIDTH == 128) |
78 | extern const unsigned char rockbox112x37[]; | 78 | extern const unsigned char rockbox112x37[]; |
79 | #endif | 79 | #endif |
80 | #if LCD_WIDTH >= 160 | 80 | #ifdef IRIVER_H300_SERIES |
81 | #define ROCKBOXLOGO_WIDTH 220 | ||
82 | #define ROCKBOXLOGO_HEIGHT 68 | ||
83 | extern const unsigned short rockboxlogo[]; | ||
84 | #elif LCD_WIDTH >= 160 | ||
81 | extern const unsigned char rockbox160x53x2[]; | 85 | extern const unsigned char rockbox160x53x2[]; |
82 | #endif | 86 | #endif |
83 | 87 | ||