summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Soffke <christian.soffke@gmail.com>2023-01-01 07:48:42 +0100
committerChristian Soffke <christian.soffke@gmail.com>2023-01-05 23:45:41 -0500
commit9bd524944598e3259e01269c9516de776063f645 (patch)
tree3d1e692e2b4df1c5c67ebffb57605eff6f651dd0
parent9367ef1ed6b78d6bc078620009e383b3deae60b2 (diff)
downloadrockbox-9bd524944598e3259e01269c9516de776063f645.tar.gz
rockbox-9bd524944598e3259e01269c9516de776063f645.zip
plugins: Credits: Fix logo sizes
Commit 1930ca8 repurposed the 'Logo' plugin's logos, whose dimensions are different from those used by show_logo, which was previously called to display the logo. Change-Id: I4d0c5f597dadfdadae244d895518bbcfefebb581
Diffstat
-rw-r--r--apps/plugins/bitmaps/native/SOURCES39
-rw-r--r--apps/plugins/bitmaps/native/creditslogo.112x30x1.bmpbin0 -> 542 bytes
-rw-r--r--apps/plugins/bitmaps/native/creditslogo.128x40x16.bmpbin0 -> 15414 bytes
-rw-r--r--apps/plugins/bitmaps/native/creditslogo.128x42x1.bmpbin0 -> 736 bytes
-rw-r--r--apps/plugins/bitmaps/native/creditslogo.128x42x2.bmpbin0 -> 2808 bytes
-rw-r--r--apps/plugins/bitmaps/native/creditslogo.132x40x16.bmpbin0 -> 15894 bytes
-rw-r--r--apps/plugins/bitmaps/native/creditslogo.138x46x2.bmpbin0 -> 3392 bytes
-rw-r--r--apps/plugins/bitmaps/native/creditslogo.160x50x16.bmpbin0 -> 24054 bytes
-rw-r--r--apps/plugins/bitmaps/native/creditslogo.160x53x1.bmpbin0 -> 1122 bytes
-rw-r--r--apps/plugins/bitmaps/native/creditslogo.160x53x2.bmpbin0 -> 4312 bytes
-rw-r--r--apps/plugins/bitmaps/native/creditslogo.176x54x16.bmpbin0 -> 28566 bytes
-rw-r--r--apps/plugins/bitmaps/native/creditslogo.220x68x16.bmpbin0 -> 44934 bytes
-rw-r--r--apps/plugins/bitmaps/native/creditslogo.240x74x16.bmpbin0 -> 53334 bytes
-rw-r--r--apps/plugins/bitmaps/native/creditslogo.320x98x16.bmpbin0 -> 94136 bytes
-rw-r--r--apps/plugins/bitmaps/native/creditslogo.480x149x16.bmpbin0 -> 214614 bytes
-rw-r--r--apps/plugins/bitmaps/native/creditslogo.640x198x16.bmpbin0 -> 380214 bytes
-rw-r--r--apps/plugins/bitmaps/native/creditslogo.96x30x16.bmpbin0 -> 8694 bytes
-rw-r--r--apps/plugins/bitmaps/remote_native/SOURCES7
-rw-r--r--apps/plugins/bitmaps/remote_native/remote_creditslogo.128x42x1.bmpbin0 -> 736 bytes
-rw-r--r--apps/plugins/bitmaps/remote_native/remote_creditslogo.128x42x2.bmpbin0 -> 2808 bytes
-rw-r--r--apps/plugins/credits.c16
21 files changed, 54 insertions, 8 deletions
diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES
index d0cc853f5b..814845dc5b 100644
--- a/apps/plugins/bitmaps/native/SOURCES
+++ b/apps/plugins/bitmaps/native/SOURCES
@@ -973,6 +973,45 @@ rockboxlogo.91x32x1.bmp
973#endif 973#endif
974#endif 974#endif
975 975
976/* Credits logo */
977#if (LCD_DEPTH == 1)
978#if (LCD_WIDTH == 160)
979creditslogo.160x53x1.bmp
980#elif (LCD_WIDTH == 128)
981creditslogo.128x42x1.bmp
982#else
983creditslogo.112x30x1.bmp
984#endif
985#elif (LCD_WIDTH == 96) && (LCD_DEPTH >= 16)
986creditslogo.96x30x16.bmp
987#elif (LCD_WIDTH == 128) && (LCD_DEPTH == 2)
988creditslogo.128x42x2.bmp
989#elif (LCD_WIDTH == 128) && (LCD_DEPTH >= 16)
990creditslogo.128x40x16.bmp
991#elif (LCD_WIDTH == 132) && (LCD_DEPTH >= 16)
992creditslogo.132x40x16.bmp
993#elif (LCD_WIDTH == 138) && (LCD_DEPTH >= 2)
994creditslogo.138x46x2.bmp
995#elif (LCD_WIDTH == 160) && (LCD_DEPTH == 2)
996creditslogo.160x53x2.bmp
997#elif (LCD_WIDTH == 320) && (LCD_DEPTH == 2)
998creditslogo.160x53x2.bmp
999#elif (LCD_WIDTH == 160) && (LCD_DEPTH >= 16)
1000creditslogo.160x50x16.bmp
1001#elif (LCD_WIDTH == 176) && (LCD_DEPTH >= 16)
1002creditslogo.176x54x16.bmp
1003#elif (LCD_WIDTH == 220) && (LCD_DEPTH >= 16)
1004creditslogo.220x68x16.bmp
1005#elif (LCD_WIDTH == 240) && (LCD_DEPTH >= 16)
1006creditslogo.240x74x16.bmp
1007#elif (LCD_WIDTH >= 320) && (LCD_WIDTH < 480) && (LCD_DEPTH >= 16)
1008creditslogo.320x98x16.bmp
1009#elif (LCD_WIDTH >= 480) && (LCD_WIDTH < 640) && (LCD_DEPTH >= 16)
1010creditslogo.480x149x16.bmp
1011#elif (LCD_WIDTH >= 640) && (LCD_DEPTH >= 16)
1012creditslogo.640x198x16.bmp
1013#endif
1014
976/* Pitch detector */ 1015/* Pitch detector */
977/* The following preprocessor condition must match the condition */ 1016/* The following preprocessor condition must match the condition */
978/* for pitch detector from plugins/SOURCES */ 1017/* for pitch detector from plugins/SOURCES */
diff --git a/apps/plugins/bitmaps/native/creditslogo.112x30x1.bmp b/apps/plugins/bitmaps/native/creditslogo.112x30x1.bmp
new file mode 100644
index 0000000000..c414ffb27b
--- /dev/null
+++ b/apps/plugins/bitmaps/native/creditslogo.112x30x1.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/creditslogo.128x40x16.bmp b/apps/plugins/bitmaps/native/creditslogo.128x40x16.bmp
new file mode 100644
index 0000000000..228dbddbd5
--- /dev/null
+++ b/apps/plugins/bitmaps/native/creditslogo.128x40x16.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/creditslogo.128x42x1.bmp b/apps/plugins/bitmaps/native/creditslogo.128x42x1.bmp
new file mode 100644
index 0000000000..27d8e5fc26
--- /dev/null
+++ b/apps/plugins/bitmaps/native/creditslogo.128x42x1.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/creditslogo.128x42x2.bmp b/apps/plugins/bitmaps/native/creditslogo.128x42x2.bmp
new file mode 100644
index 0000000000..fa12aa4bd7
--- /dev/null
+++ b/apps/plugins/bitmaps/native/creditslogo.128x42x2.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/creditslogo.132x40x16.bmp b/apps/plugins/bitmaps/native/creditslogo.132x40x16.bmp
new file mode 100644
index 0000000000..865a8ed59d
--- /dev/null
+++ b/apps/plugins/bitmaps/native/creditslogo.132x40x16.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/creditslogo.138x46x2.bmp b/apps/plugins/bitmaps/native/creditslogo.138x46x2.bmp
new file mode 100644
index 0000000000..4b5d7beb16
--- /dev/null
+++ b/apps/plugins/bitmaps/native/creditslogo.138x46x2.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/creditslogo.160x50x16.bmp b/apps/plugins/bitmaps/native/creditslogo.160x50x16.bmp
new file mode 100644
index 0000000000..59e472def1
--- /dev/null
+++ b/apps/plugins/bitmaps/native/creditslogo.160x50x16.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/creditslogo.160x53x1.bmp b/apps/plugins/bitmaps/native/creditslogo.160x53x1.bmp
new file mode 100644
index 0000000000..7e34b23c6b
--- /dev/null
+++ b/apps/plugins/bitmaps/native/creditslogo.160x53x1.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/creditslogo.160x53x2.bmp b/apps/plugins/bitmaps/native/creditslogo.160x53x2.bmp
new file mode 100644
index 0000000000..240cf10686
--- /dev/null
+++ b/apps/plugins/bitmaps/native/creditslogo.160x53x2.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/creditslogo.176x54x16.bmp b/apps/plugins/bitmaps/native/creditslogo.176x54x16.bmp
new file mode 100644
index 0000000000..bf43a65e42
--- /dev/null
+++ b/apps/plugins/bitmaps/native/creditslogo.176x54x16.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/creditslogo.220x68x16.bmp b/apps/plugins/bitmaps/native/creditslogo.220x68x16.bmp
new file mode 100644
index 0000000000..1dc68a09f2
--- /dev/null
+++ b/apps/plugins/bitmaps/native/creditslogo.220x68x16.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/creditslogo.240x74x16.bmp b/apps/plugins/bitmaps/native/creditslogo.240x74x16.bmp
new file mode 100644
index 0000000000..fd335b2fb8
--- /dev/null
+++ b/apps/plugins/bitmaps/native/creditslogo.240x74x16.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/creditslogo.320x98x16.bmp b/apps/plugins/bitmaps/native/creditslogo.320x98x16.bmp
new file mode 100644
index 0000000000..26dcac89c3
--- /dev/null
+++ b/apps/plugins/bitmaps/native/creditslogo.320x98x16.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/creditslogo.480x149x16.bmp b/apps/plugins/bitmaps/native/creditslogo.480x149x16.bmp
new file mode 100644
index 0000000000..c73d9374e4
--- /dev/null
+++ b/apps/plugins/bitmaps/native/creditslogo.480x149x16.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/creditslogo.640x198x16.bmp b/apps/plugins/bitmaps/native/creditslogo.640x198x16.bmp
new file mode 100644
index 0000000000..ec6a16da5d
--- /dev/null
+++ b/apps/plugins/bitmaps/native/creditslogo.640x198x16.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/native/creditslogo.96x30x16.bmp b/apps/plugins/bitmaps/native/creditslogo.96x30x16.bmp
new file mode 100644
index 0000000000..e032ebae34
--- /dev/null
+++ b/apps/plugins/bitmaps/native/creditslogo.96x30x16.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/remote_native/SOURCES b/apps/plugins/bitmaps/remote_native/SOURCES
index b3cc2157ff..78cfd78212 100644
--- a/apps/plugins/bitmaps/remote_native/SOURCES
+++ b/apps/plugins/bitmaps/remote_native/SOURCES
@@ -22,3 +22,10 @@ remote_rockboxlogo.91x32x1.bmp
22#elif (LCD_REMOTE_DEPTH == 2) 22#elif (LCD_REMOTE_DEPTH == 2)
23remote_rockboxlogo.91x32x2.bmp 23remote_rockboxlogo.91x32x2.bmp
24#endif 24#endif
25
26*/ Credits logo */
27#if (LCD_REMOTE_DEPTH == 1)
28remote_creditslogo.128x42x1.bmp
29#elif (LCD_REMOTE_DEPTH == 2)
30remote_creditslogo.128x42x2.bmp
31#endif
diff --git a/apps/plugins/bitmaps/remote_native/remote_creditslogo.128x42x1.bmp b/apps/plugins/bitmaps/remote_native/remote_creditslogo.128x42x1.bmp
new file mode 100644
index 0000000000..27d8e5fc26
--- /dev/null
+++ b/apps/plugins/bitmaps/remote_native/remote_creditslogo.128x42x1.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/remote_native/remote_creditslogo.128x42x2.bmp b/apps/plugins/bitmaps/remote_native/remote_creditslogo.128x42x2.bmp
new file mode 100644
index 0000000000..fa12aa4bd7
--- /dev/null
+++ b/apps/plugins/bitmaps/remote_native/remote_creditslogo.128x42x2.bmp
Binary files differ
diff --git a/apps/plugins/credits.c b/apps/plugins/credits.c
index 86ca0ff4ab..f4716651fd 100644
--- a/apps/plugins/credits.c
+++ b/apps/plugins/credits.c
@@ -24,16 +24,16 @@
24#ifdef HAVE_REMOTE_LCD 24#ifdef HAVE_REMOTE_LCD
25#define REMOTE_WIDTH LCD_REMOTE_WIDTH 25#define REMOTE_WIDTH LCD_REMOTE_WIDTH
26#define REMOTE_HEIGHT LCD_REMOTE_HEIGHT 26#define REMOTE_HEIGHT LCD_REMOTE_HEIGHT
27#include "pluginbitmaps/remote_rockboxlogo.h" 27#include "pluginbitmaps/remote_creditslogo.h"
28#define REMOTE_LOGO_WIDTH BMPWIDTH_remote_rockboxlogo 28#define REMOTE_LOGO_WIDTH BMPWIDTH_remote_creditslogo
29#define REMOTE_LOGO_HEIGHT BMPHEIGHT_remote_rockboxlogo 29#define REMOTE_LOGO_HEIGHT BMPHEIGHT_remote_creditslogo
30#define REMOTE_LOGO (const fb_remote_data*)remote_rockboxlogo 30#define REMOTE_LOGO (const fb_remote_data*)remote_creditslogo
31#endif /* HAVE_REMOTE_LCD */ 31#endif /* HAVE_REMOTE_LCD */
32 32
33#define LOGO (const fb_data*)rockboxlogo 33#define LOGO (const fb_data*)creditslogo
34#include "pluginbitmaps/rockboxlogo.h" 34#include "pluginbitmaps/creditslogo.h"
35#define LOGO_WIDTH BMPWIDTH_rockboxlogo 35#define LOGO_WIDTH BMPWIDTH_creditslogo
36#define LOGO_HEIGHT BMPHEIGHT_rockboxlogo 36#define LOGO_HEIGHT BMPHEIGHT_creditslogo
37 37
38static const char* const credits[] = { 38static const char* const credits[] = {
39#include "credits.raw" /* generated list of names from docs/CREDITS */ 39#include "credits.raw" /* generated list of names from docs/CREDITS */
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-07 17:46:36 +0000