From 4cd37d5ba4ed840f7d08ec6b6024cfa8c16457da Mon Sep 17 00:00:00 2001 From: Jonas Häggqvist Date: Thu, 31 Jan 2008 19:28:51 +0000 Subject: Use nicer logos in the logo plugin, plus use the bitmap build system magic. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16189 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/bitmaps/native/SOURCES | 27 ++++ .../bitmaps/native/rockboxlogo.112x30x1.bmp | Bin 0 -> 542 bytes .../bitmaps/native/rockboxlogo.128x40x16.bmp | Bin 0 -> 10294 bytes .../bitmaps/native/rockboxlogo.138x46x2.bmp | Bin 0 -> 3392 bytes .../bitmaps/native/rockboxlogo.220x68x16.bmp | Bin 0 -> 44934 bytes .../bitmaps/native/rockboxlogo.90x28x16.bmp | Bin 0 -> 7670 bytes .../plugins/bitmaps/native/rockboxlogo.91x32x1.bmp | Bin 0 -> 446 bytes .../plugins/bitmaps/native/rockboxlogo.91x32x2.bmp | Bin 0 -> 1566 bytes apps/plugins/bitmaps/remote_native/SOURCES | 7 + .../remote_native/remote_rockboxlogo.91x32x1.bmp | Bin 0 -> 446 bytes .../remote_native/remote_rockboxlogo.91x32x2.bmp | Bin 0 -> 1566 bytes apps/plugins/logo.c | 144 +++------------------ 12 files changed, 50 insertions(+), 128 deletions(-) create mode 100644 apps/plugins/bitmaps/native/rockboxlogo.112x30x1.bmp create mode 100644 apps/plugins/bitmaps/native/rockboxlogo.128x40x16.bmp create mode 100644 apps/plugins/bitmaps/native/rockboxlogo.138x46x2.bmp create mode 100644 apps/plugins/bitmaps/native/rockboxlogo.220x68x16.bmp create mode 100644 apps/plugins/bitmaps/native/rockboxlogo.90x28x16.bmp create mode 100644 apps/plugins/bitmaps/native/rockboxlogo.91x32x1.bmp create mode 100644 apps/plugins/bitmaps/native/rockboxlogo.91x32x2.bmp create mode 100644 apps/plugins/bitmaps/remote_native/remote_rockboxlogo.91x32x1.bmp create mode 100644 apps/plugins/bitmaps/remote_native/remote_rockboxlogo.91x32x2.bmp (limited to 'apps/plugins') diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES index d9a0be32c9..c3a74ef08b 100644 --- a/apps/plugins/bitmaps/native/SOURCES +++ b/apps/plugins/bitmaps/native/SOURCES @@ -577,5 +577,32 @@ matrix_normal.bmp sliding_puzzle.80x64x1.bmp #endif +/* Logo */ +#if LCD_DEPTH == 16 +#if (LCD_WIDTH >= 320) + rockboxlogo.220x68x16.bmp +#elif (LCD_WIDTH > 160) + rockboxlogo.128x40x16.bmp +#else + rockboxlogo.90x28x16.bmp +#endif + +#elif LCD_DEPTH == 2 +#if (LCD_WIDTH > 138) + rockboxlogo.138x46x2.bmp +#else + rockboxlogo.91x32x2.bmp +#endif +#endif + +#elif LCD_DEPTH == 1 +#if (LCD_WIDTH > 112) + /* Such a screen isn't currently in any target */ + rockboxlogo.112x30x1.bmp +#else + rockboxlogo.91x32x1.bmp +#endif +#endif + #endif /* HAVE_LCD_BITMAP */ diff --git a/apps/plugins/bitmaps/native/rockboxlogo.112x30x1.bmp b/apps/plugins/bitmaps/native/rockboxlogo.112x30x1.bmp new file mode 100644 index 0000000000..c414ffb27b Binary files /dev/null and b/apps/plugins/bitmaps/native/rockboxlogo.112x30x1.bmp differ diff --git a/apps/plugins/bitmaps/native/rockboxlogo.128x40x16.bmp b/apps/plugins/bitmaps/native/rockboxlogo.128x40x16.bmp new file mode 100644 index 0000000000..b7a81c5961 Binary files /dev/null and b/apps/plugins/bitmaps/native/rockboxlogo.128x40x16.bmp differ diff --git a/apps/plugins/bitmaps/native/rockboxlogo.138x46x2.bmp b/apps/plugins/bitmaps/native/rockboxlogo.138x46x2.bmp new file mode 100644 index 0000000000..4b5d7beb16 Binary files /dev/null and b/apps/plugins/bitmaps/native/rockboxlogo.138x46x2.bmp differ diff --git a/apps/plugins/bitmaps/native/rockboxlogo.220x68x16.bmp b/apps/plugins/bitmaps/native/rockboxlogo.220x68x16.bmp new file mode 100644 index 0000000000..1dc68a09f2 Binary files /dev/null and b/apps/plugins/bitmaps/native/rockboxlogo.220x68x16.bmp differ diff --git a/apps/plugins/bitmaps/native/rockboxlogo.90x28x16.bmp b/apps/plugins/bitmaps/native/rockboxlogo.90x28x16.bmp new file mode 100644 index 0000000000..51b2cccbb9 Binary files /dev/null and b/apps/plugins/bitmaps/native/rockboxlogo.90x28x16.bmp differ diff --git a/apps/plugins/bitmaps/native/rockboxlogo.91x32x1.bmp b/apps/plugins/bitmaps/native/rockboxlogo.91x32x1.bmp new file mode 100644 index 0000000000..ec74318ba1 Binary files /dev/null and b/apps/plugins/bitmaps/native/rockboxlogo.91x32x1.bmp differ diff --git a/apps/plugins/bitmaps/native/rockboxlogo.91x32x2.bmp b/apps/plugins/bitmaps/native/rockboxlogo.91x32x2.bmp new file mode 100644 index 0000000000..eaf25b4f26 Binary files /dev/null and b/apps/plugins/bitmaps/native/rockboxlogo.91x32x2.bmp differ diff --git a/apps/plugins/bitmaps/remote_native/SOURCES b/apps/plugins/bitmaps/remote_native/SOURCES index a884ebb24a..3633f23eb1 100644 --- a/apps/plugins/bitmaps/remote_native/SOURCES +++ b/apps/plugins/bitmaps/remote_native/SOURCES @@ -15,3 +15,10 @@ clock_smalldigits_remote.112x64x1.bmp clock_segments_remote.112x64x1.bmp clock_smallsegments_remote.112x64x1.bmp + +/* Logo */ +#if (LCD_REMOTE_DEPTH == 1) + remote_rockboxlogo.91x32x1.bmp +#elif (LCD_REMOTE_DEPTH == 2) + remote_rockboxlogo.91x32x2.bmp +#endif diff --git a/apps/plugins/bitmaps/remote_native/remote_rockboxlogo.91x32x1.bmp b/apps/plugins/bitmaps/remote_native/remote_rockboxlogo.91x32x1.bmp new file mode 100644 index 0000000000..ec74318ba1 Binary files /dev/null and b/apps/plugins/bitmaps/remote_native/remote_rockboxlogo.91x32x1.bmp differ diff --git a/apps/plugins/bitmaps/remote_native/remote_rockboxlogo.91x32x2.bmp b/apps/plugins/bitmaps/remote_native/remote_rockboxlogo.91x32x2.bmp new file mode 100644 index 0000000000..eaf25b4f26 Binary files /dev/null and b/apps/plugins/bitmaps/remote_native/remote_rockboxlogo.91x32x2.bmp differ diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c index dc1fc6e7cb..898681b18a 100644 --- a/apps/plugins/logo.c +++ b/apps/plugins/logo.c @@ -31,137 +31,25 @@ PLUGIN_HEADER #define REMOTE_HEIGHT LCD_REMOTE_HEIGHT #define REMOTE_LOGO_WIDTH 91 #define REMOTE_LOGO_HEIGHT 32 -#define REMOTE_LOGO rockbox91x32 -/* Smaller logo for the remote */ -const unsigned char rockbox91x32[] = { - 0x00, 0x02, 0x7f, 0x02, 0xfa, 0xfa, 0xfa, 0xfa, 0xfa, 0xfa, 0xf8, 0xf8, 0xf0, - 0xe0, 0x80, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xf0, 0xf8, 0xfa, 0xfa, 0xf4, 0xf4, - 0xe8, 0x90, 0x60, 0x80, 0x60, 0x90, 0xe8, 0xf4, 0xf4, 0xfa, 0xfa, 0xfa, 0xfa, - 0xf4, 0xe8, 0x04, 0xf4, 0xf4, 0xf4, 0x04, 0xfe, 0x04, 0xc0, 0xf0, 0xf4, 0xf4, - 0x34, 0x1e, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - - 0x70, 0x88, 0xf0, 0x00, 0xff, 0xff, 0xff, 0xff, 0x02, 0xc2, 0x3c, 0xc3, 0xff, - 0xff, 0xff, 0x00, 0xfe, 0xff, 0xff, 0x07, 0x01, 0x00, 0xfe, 0x02, 0xfd, 0x07, - 0xff, 0xff, 0xfe, 0x01, 0xfe, 0xff, 0xff, 0x0f, 0x01, 0x00, 0x80, 0x00, 0x01, - 0x03, 0x0f, 0x00, 0xff, 0xff, 0xff, 0xc0, 0xf9, 0xfe, 0xff, 0xff, 0x07, 0x04, - 0x04, 0x04, 0xfc, 0x80, 0x40, 0x40, 0x40, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0xc0, 0x40, 0x40, - 0x40, 0x40, 0x80, 0x00, 0x80, 0x40, 0x80, 0x40, 0x40, 0x40, 0x40, 0xc0, 0x00, - - 0x00, 0x7c, 0xc3, 0x9e, 0x67, 0x37, 0x8f, 0xff, 0x1f, 0xff, 0xff, 0xff, 0xff, - 0xe3, 0x80, 0x00, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x01, 0x03, 0xc1, 0x3f, 0xc1, - 0xff, 0xff, 0xff, 0x01, 0xff, 0xff, 0xff, 0xc1, 0x01, 0x01, 0xff, 0x01, 0x00, - 0x00, 0xc0, 0x00, 0xff, 0xff, 0xff, 0xcf, 0x3f, 0xff, 0xf8, 0xff, 0x00, 0x00, - 0x00, 0x00, 0xe0, 0x10, 0x08, 0x18, 0xe8, 0x10, 0xe0, 0x00, 0x01, 0x02, 0x04, - 0x02, 0x01, 0xe0, 0x10, 0x08, 0x08, 0x18, 0xe8, 0x10, 0xe0, 0x00, 0x01, 0x00, - 0x00, 0xe0, 0x40, 0x01, 0x02, 0x01, 0x40, 0xe0, 0x18, 0xe4, 0x1b, 0x04, 0x03, - - 0x00, 0x00, 0x00, 0x00, 0x77, 0x6e, 0x61, 0x7f, 0x40, 0xff, 0x00, 0x07, 0x1f, - 0x3f, 0x7f, 0x7c, 0x71, 0xcf, 0x5f, 0x3f, 0x7e, 0x7c, 0x7d, 0x7d, 0x7e, 0x3f, - 0x1f, 0x0f, 0x01, 0x00, 0x41, 0x47, 0x5f, 0x7f, 0x7e, 0x7c, 0x7f, 0x7c, 0x7e, - 0x3f, 0x1f, 0x00, 0x7f, 0x7f, 0x7f, 0x01, 0x4e, 0x71, 0xcf, 0x7f, 0x40, 0x40, - 0x40, 0x40, 0x60, 0x21, 0x42, 0x43, 0x42, 0x41, 0x40, 0x20, 0x10, 0x08, 0x04, - 0x08, 0x10, 0x20, 0x41, 0x42, 0x42, 0x43, 0x42, 0x41, 0x40, 0x60, 0x50, 0x40, - 0x40, 0x40, 0x20, 0x50, 0x28, 0x10, 0x20, 0x40, 0x43, 0x44, 0x5b, 0x64, 0x18, -}; +#define REMOTE_LOGO remote_rockboxlogo +extern const fb_data remote_rockboxlogo[]; #endif /* HAVE_REMOTE_LCD */ -#if LCD_WIDTH > 112 -#define LOGO_WIDTH 112 -#define LOGO_HEIGHT 37 -#define LOGO rockbox112x37 -const unsigned char rockbox112x37[]={ - 0x00, 0x00, 0x02, 0xff, 0x02, 0xfa, 0xfa, 0xfa, 0xfa, 0xfa, 0xfa, 0xfa, 0xfa, - 0xf8, 0xf8, 0xf0, 0xe0, 0x80, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xf8, 0xf8, 0xfc, - 0x7c, 0x7d, 0xfd, 0xfa, 0xfa, 0xf4, 0xe8, 0x90, 0x60, 0x80, 0xe0, 0x10, 0xc8, - 0xe4, 0xf2, 0xfa, 0xfd, 0xfd, 0xfd, 0xfd, 0xfd, 0xfa, 0xfa, 0xf4, 0x02, 0xfa, - 0xfa, 0xfa, 0xfa, 0x02, 0xff, 0x02, 0x00, 0x80, 0xe2, 0xfa, 0xfa, 0xfa, 0xfa, - 0x3a, 0x0e, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - - 0x60, 0x90, 0x20, 0xc0, 0x00, 0xff, 0xff, 0xff, 0xff, 0x05, 0x05, 0x05, 0xf9, - 0x03, 0xff, 0xff, 0xff, 0xff, 0x00, 0xfc, 0xff, 0xff, 0xff, 0x0f, 0x01, 0x00, - 0xff, 0x01, 0x0e, 0xf1, 0x0f, 0xff, 0xff, 0xff, 0xfc, 0x03, 0xf8, 0xff, 0xff, - 0xff, 0x0f, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x0f, 0x00, 0xff, - 0xff, 0xff, 0xff, 0x80, 0xff, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0x07, 0x07, 0x04, - 0x04, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - - 0xc0, 0x38, 0x07, 0x9d, 0x60, 0xbf, 0xbf, 0xff, 0xff, 0xfc, 0xff, 0xfd, 0xfe, - 0xff, 0xff, 0x9f, 0x0f, 0x03, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x08, 0x08, - 0x3f, 0x08, 0x08, 0xff, 0x08, 0xff, 0xff, 0xff, 0xff, 0x08, 0xff, 0xff, 0xff, - 0xff, 0x08, 0x08, 0x08, 0x08, 0xfe, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0xff, - 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xf3, 0xc0, 0xff, 0x00, 0x00, 0x00, - 0x00, 0x03, 0x82, 0x41, 0x41, 0xa1, 0xa1, 0x41, 0x41, 0x81, 0x02, 0x02, 0x04, - 0x08, 0x30, 0x08, 0x04, 0x02, 0x02, 0x81, 0x41, 0x41, 0xa1, 0xa1, 0x41, 0x41, - 0x81, 0x01, 0x03, 0x05, 0x01, 0x01, 0x01, 0x01, 0x02, 0x0c, 0x12, 0x0d, 0x02, - 0x01, 0x01, 0xc1, 0x31, 0xc9, 0x35, 0x0b, 0x04, +#if LCD_DEPTH == 16 +#define LOGO_WIDTH 128 +#define LOGO_HEIGHT 40 - 0x01, 0x07, 0x0c, 0x09, 0x18, 0xe3, 0x1b, 0xfc, 0xff, 0x00, 0xff, 0x03, 0x1f, - 0x7f, 0xff, 0xff, 0xfc, 0xf0, 0x80, 0x0f, 0x7f, 0xff, 0xff, 0xfc, 0xe0, 0xc0, - 0xa0, 0xa0, 0xdc, 0xe3, 0xfc, 0xff, 0xff, 0x7f, 0x0f, 0x00, 0x07, 0x3f, 0xff, - 0xff, 0xfc, 0xf0, 0xe0, 0xc0, 0xff, 0xc0, 0xc0, 0xe0, 0xf0, 0xfc, 0x00, 0xff, - 0xff, 0xff, 0xff, 0x06, 0x19, 0x67, 0x9f, 0x7f, 0xff, 0xff, 0xfc, 0xf0, 0xc0, - 0x00, 0x06, 0x19, 0x20, 0x20, 0x50, 0x50, 0x29, 0x26, 0x19, 0x06, 0x00, 0x00, - 0x00, 0xc0, 0x00, 0x00, 0x00, 0x06, 0x19, 0x20, 0x20, 0x50, 0x50, 0x29, 0x26, - 0x19, 0x06, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x06, 0x00, 0x00, 0x80, 0x00, 0x00, - 0x06, 0x09, 0x36, 0xc9, 0x30, 0xc0, 0x00, 0x00, +#elif LCD_DEPTH == 2 +#define LOGO_WIDTH 138 +#define LOGO_HEIGHT 46 - 0x20, 0xa0, 0x00, 0x40, 0x83, 0xec, 0x0c, 0x0f, 0x0f, 0xe8, 0xff, 0xa8, 0x08, - 0x00, 0x01, 0x0f, 0x0f, 0x0f, 0x0f, 0x0e, 0x58, 0xc9, 0x03, 0x47, 0x07, 0xef, - 0xef, 0xaf, 0x0f, 0x07, 0x07, 0x03, 0x01, 0x00, 0x00, 0x08, 0x48, 0xe8, 0xe8, - 0xa9, 0x4b, 0xef, 0xef, 0xaf, 0xaf, 0xaf, 0x07, 0x47, 0x27, 0xc3, 0x00, 0x4f, - 0x8f, 0xef, 0x0f, 0x00, 0x00, 0xe8, 0xe9, 0xae, 0x19, 0x0f, 0x0f, 0x0f, 0x0f, - 0x0f, 0x0c, 0x04, 0x48, 0xc8, 0x08, 0x48, 0x68, 0x48, 0x08, 0x04, 0x24, 0xe2, - 0xe1, 0xa0, 0x61, 0x42, 0x04, 0x04, 0x88, 0x28, 0x08, 0x08, 0x28, 0xe8, 0xe8, - 0xa8, 0xc8, 0xec, 0xea, 0xa8, 0x28, 0xa8, 0x08, 0x44, 0xeb, 0x24, 0x03, 0x04, - 0x08, 0xe8, 0xe8, 0xa8, 0x09, 0x0a, 0x0d, 0x02, -}; - -#else /* LCD_WIDTH <= 112 */ -#define LOGO_WIDTH 91 -#define LOGO_HEIGHT 32 -#define LOGO rockbox91x32 -const unsigned char rockbox91x32[] = { - 0x00, 0x02, 0x7f, 0x02, 0xfa, 0xfa, 0xfa, 0xfa, 0xfa, 0xfa, 0xf8, 0xf8, 0xf0, - 0xe0, 0x80, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xf0, 0xf8, 0xfa, 0xfa, 0xf4, 0xf4, - 0xe8, 0x90, 0x60, 0x80, 0x60, 0x90, 0xe8, 0xf4, 0xf4, 0xfa, 0xfa, 0xfa, 0xfa, - 0xf4, 0xe8, 0x04, 0xf4, 0xf4, 0xf4, 0x04, 0xfe, 0x04, 0xc0, 0xf0, 0xf4, 0xf4, - 0x34, 0x1e, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - - 0x70, 0x88, 0xf0, 0x00, 0xff, 0xff, 0xff, 0xff, 0x02, 0xc2, 0x3c, 0xc3, 0xff, - 0xff, 0xff, 0x00, 0xfe, 0xff, 0xff, 0x07, 0x01, 0x00, 0xfe, 0x02, 0xfd, 0x07, - 0xff, 0xff, 0xfe, 0x01, 0xfe, 0xff, 0xff, 0x0f, 0x01, 0x00, 0x80, 0x00, 0x01, - 0x03, 0x0f, 0x00, 0xff, 0xff, 0xff, 0xc0, 0xf9, 0xfe, 0xff, 0xff, 0x07, 0x04, - 0x04, 0x04, 0xfc, 0x80, 0x40, 0x40, 0x40, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0xc0, 0x40, 0x40, - 0x40, 0x40, 0x80, 0x00, 0x80, 0x40, 0x80, 0x40, 0x40, 0x40, 0x40, 0xc0, 0x00, - - 0x00, 0x7c, 0xc3, 0x9e, 0x67, 0x37, 0x8f, 0xff, 0x1f, 0xff, 0xff, 0xff, 0xff, - 0xe3, 0x80, 0x00, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x01, 0x03, 0xc1, 0x3f, 0xc1, - 0xff, 0xff, 0xff, 0x01, 0xff, 0xff, 0xff, 0xc1, 0x01, 0x01, 0xff, 0x01, 0x00, - 0x00, 0xc0, 0x00, 0xff, 0xff, 0xff, 0xcf, 0x3f, 0xff, 0xf8, 0xff, 0x00, 0x00, - 0x00, 0x00, 0xe0, 0x10, 0x08, 0x18, 0xe8, 0x10, 0xe0, 0x00, 0x01, 0x02, 0x04, - 0x02, 0x01, 0xe0, 0x10, 0x08, 0x08, 0x18, 0xe8, 0x10, 0xe0, 0x00, 0x01, 0x00, - 0x00, 0xe0, 0x40, 0x01, 0x02, 0x01, 0x40, 0xe0, 0x18, 0xe4, 0x1b, 0x04, 0x03, +#elif LCD_DEPTH == 1 +#define LOGO_WIDTH 112 +#define LOGO_HEIGHT 30 +#endif - 0x00, 0x00, 0x00, 0x00, 0x77, 0x6e, 0x61, 0x7f, 0x40, 0xff, 0x00, 0x07, 0x1f, - 0x3f, 0x7f, 0x7c, 0x71, 0xcf, 0x5f, 0x3f, 0x7e, 0x7c, 0x7d, 0x7d, 0x7e, 0x3f, - 0x1f, 0x0f, 0x01, 0x00, 0x41, 0x47, 0x5f, 0x7f, 0x7e, 0x7c, 0x7f, 0x7c, 0x7e, - 0x3f, 0x1f, 0x00, 0x7f, 0x7f, 0x7f, 0x01, 0x4e, 0x71, 0xcf, 0x7f, 0x40, 0x40, - 0x40, 0x40, 0x60, 0x21, 0x42, 0x43, 0x42, 0x41, 0x40, 0x20, 0x10, 0x08, 0x04, - 0x08, 0x10, 0x20, 0x41, 0x42, 0x42, 0x43, 0x42, 0x41, 0x40, 0x60, 0x50, 0x40, - 0x40, 0x40, 0x20, 0x50, 0x28, 0x10, 0x20, 0x40, 0x43, 0x44, 0x5b, 0x64, 0x18, -}; -#endif /* LCD_WIDTH */ +#define LOGO rockboxlogo +extern const fb_data rockboxlogo[]; #else /* !LCD_BITMAP */ #define DISPLAY_WIDTH 55 @@ -280,10 +168,10 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) { while (1) { #ifdef HAVE_LCD_BITMAP rb->lcd_clear_display(); - rb->lcd_mono_bitmap(LOGO, x, y, LOGO_WIDTH, LOGO_HEIGHT); + rb->lcd_bitmap(LOGO, x, y, LOGO_WIDTH, LOGO_HEIGHT); #ifdef REMOTE_LOGO rb->lcd_remote_clear_display(); - rb->lcd_remote_mono_bitmap(REMOTE_LOGO, + rb->lcd_remote_bitmap(REMOTE_LOGO, (x * (REMOTE_WIDTH - REMOTE_LOGO_WIDTH)) / (DISPLAY_WIDTH - LOGO_WIDTH), (y * (REMOTE_HEIGHT - REMOTE_LOGO_HEIGHT)) / (DISPLAY_HEIGHT - LOGO_HEIGHT), REMOTE_LOGO_WIDTH, REMOTE_LOGO_HEIGHT); -- cgit v1.2.3