summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2008-05-25 21:12:18 +0000
committerJens Arnold <amiconn@rockbox.org>2008-05-25 21:12:18 +0000
commit43d02f66a0ade99a8de3bd76a9d2533b11c7aa41 (patch)
tree21a4fd391a801365bf143ad6d3721e44c5224774 /apps
parent2aa0791ff80bf757534fcfb1e918515704ae4173 (diff)
downloadrockbox-43d02f66a0ade99a8de3bd76a9d2533b11c7aa41.tar.gz
rockbox-43d02f66a0ade99a8de3bd76a9d2533b11c7aa41.tar.bz2
rockbox-43d02f66a0ade99a8de3bd76a9d2533b11c7aa41.zip
Fix rockblox on all 160x128x2 and 160x128x16 targets. They used the mono bitmap intended for m:robe100 as a native one, making the background looking odd and crashing the sim. Bitmaps for monochrome targets used like native bitmaps shouldn't reside in bitmaps/mono, as that's asking for confusion.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17629 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/plugins/bitmaps/mono/SOURCES9
-rw-r--r--apps/plugins/bitmaps/native/SOURCES37
-rw-r--r--apps/plugins/bitmaps/native/rockblox_background.112x64x1.bmp (renamed from apps/plugins/bitmaps/mono/rockblox_background.112x64x1.bmp)bin1086 -> 1086 bytes
-rw-r--r--apps/plugins/bitmaps/native/rockblox_background.128x64x1.bmp (renamed from apps/plugins/bitmaps/mono/rockblox_background.128x64x1.bmp)bin1086 -> 1086 bytes
-rw-r--r--apps/plugins/bitmaps/native/rockblox_background.160x128x1.bmp (renamed from apps/plugins/bitmaps/mono/rockblox_background.160x128x1.bmp)bin2622 -> 2622 bytes
5 files changed, 25 insertions, 21 deletions
diff --git a/apps/plugins/bitmaps/mono/SOURCES b/apps/plugins/bitmaps/mono/SOURCES
index d2952d1ef7..e0e112d904 100644
--- a/apps/plugins/bitmaps/mono/SOURCES
+++ b/apps/plugins/bitmaps/mono/SOURCES
@@ -22,15 +22,6 @@ bubbles_bubble.220x176x1.bmp
bubbles_bubble.320x240x1.bmp
#endif
-/* Rockblox */
-#if (LCD_WIDTH == 112) && (LCD_HEIGHT == 64)
-rockblox_background.112x64x1.bmp
-#elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 64)
-rockblox_background.128x64x1.bmp
-#elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128)
-rockblox_background.160x128x1.bmp
-#endif
-
/* Flip it */
#ifndef HAVE_LCD_COLOR
#if LCD_WIDTH >= 140 && LCD_HEIGHT >= 122
diff --git a/apps/plugins/bitmaps/native/SOURCES b/apps/plugins/bitmaps/native/SOURCES
index 4325da9a24..704f2ce2c4 100644
--- a/apps/plugins/bitmaps/native/SOURCES
+++ b/apps/plugins/bitmaps/native/SOURCES
@@ -369,29 +369,42 @@ pegbox_pieces.8x8x1.bmp
#endif
/* Rockblox */
-#if (LCD_WIDTH == 320) && (LCD_HEIGHT == 240) && (LCD_DEPTH == 16)
+#if LCD_DEPTH == 16 /* colour versions*/
+#if (LCD_WIDTH == 320) && (LCD_HEIGHT == 240)
rockblox_background.320x240x16.bmp
-#elif (LCD_WIDTH == 240) && (LCD_HEIGHT == 320) && (LCD_DEPTH == 16)
+#elif (LCD_WIDTH == 240) && (LCD_HEIGHT == 320)
rockblox_background.240x320x16.bmp
-#elif (LCD_WIDTH >= 220) && (LCD_HEIGHT >= 176) && (LCD_DEPTH == 16)
+#elif (LCD_WIDTH == 220) && (LCD_HEIGHT == 176)
rockblox_background.220x176x16.bmp
-#elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 132) && (LCD_DEPTH == 16)
-rockblox_background.176x132x16.bmp
-#elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 220) && (LCD_DEPTH == 16)
+#elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 220)
rockblox_background.176x220x16.bmp
-#elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) && (LCD_DEPTH >= 16)
+#elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 132)
+rockblox_background.176x132x16.bmp
+#elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128)
rockblox_background.160x128x16.bmp
-#elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 128) && (LCD_DEPTH == 16)
+#elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 128)
rockblox_background.128x128x16.bmp
-#elif (LCD_WIDTH == 132) && (LCD_HEIGHT == 80) && (LCD_DEPTH == 16)
+#elif (LCD_WIDTH == 132) && (LCD_HEIGHT == 80)
rockblox_background.132x80x16.bmp
-#elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) && (LCD_DEPTH == 2)
+#endif
+#elif LCD_DEPTH == 2 /* greyscale versions */
+#if (LCD_WIDTH == 160) && (LCD_HEIGHT == 128)
rockblox_background.160x128x2.bmp
-#elif (LCD_WIDTH == 138) && (LCD_HEIGHT == 110) && (LCD_DEPTH == 2)
+#elif (LCD_WIDTH == 138) && (LCD_HEIGHT == 110)
rockblox_background.138x110x2.bmp
-#elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96) && (LCD_DEPTH == 2)
+#elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96)
rockblox_background.128x96x2.bmp
#endif
+#elif LCD_DEPTH == 1 /* monochrome versions */
+#if (LCD_WIDTH == 160) && (LCD_HEIGHT == 128)
+rockblox_background.160x128x1.bmp
+#elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 64)
+rockblox_background.128x64x1.bmp
+#elif (LCD_WIDTH == 112) && (LCD_HEIGHT == 64)
+rockblox_background.112x64x1.bmp
+#endif
+#endif /* LCD_DEPTH */
+
/* Rockpaint */
#ifdef HAVE_LCD_COLOR
diff --git a/apps/plugins/bitmaps/mono/rockblox_background.112x64x1.bmp b/apps/plugins/bitmaps/native/rockblox_background.112x64x1.bmp
index 336e3cefef..336e3cefef 100644
--- a/apps/plugins/bitmaps/mono/rockblox_background.112x64x1.bmp
+++ b/apps/plugins/bitmaps/native/rockblox_background.112x64x1.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/mono/rockblox_background.128x64x1.bmp b/apps/plugins/bitmaps/native/rockblox_background.128x64x1.bmp
index 09b4c08d95..09b4c08d95 100644
--- a/apps/plugins/bitmaps/mono/rockblox_background.128x64x1.bmp
+++ b/apps/plugins/bitmaps/native/rockblox_background.128x64x1.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/mono/rockblox_background.160x128x1.bmp b/apps/plugins/bitmaps/native/rockblox_background.160x128x1.bmp
index 77d606ae21..77d606ae21 100644
--- a/apps/plugins/bitmaps/mono/rockblox_background.160x128x1.bmp
+++ b/apps/plugins/bitmaps/native/rockblox_background.160x128x1.bmp
Binary files differ