tsiry-sandratraina.com / rockbox-zig
A modern Music Player Daemon based on Rockbox open source high quality audio player
libadwaita audio rust zig deno mpris rockbox mpd
2
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Jens Arnold 43d02f66 2aa0791f

+25 -21
-9
apps/plugins/bitmaps/mono/SOURCES
··· 22 22 bubbles_bubble.320x240x1.bmp 23 23 #endif 24 24 25 - /* Rockblox */ 26 - #if (LCD_WIDTH == 112) && (LCD_HEIGHT == 64) 27 - rockblox_background.112x64x1.bmp 28 - #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 64) 29 - rockblox_background.128x64x1.bmp 30 - #elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) 31 - rockblox_background.160x128x1.bmp 32 - #endif 33 - 34 25 /* Flip it */ 35 26 #ifndef HAVE_LCD_COLOR 36 27 #if LCD_WIDTH >= 140 && LCD_HEIGHT >= 122
apps/plugins/bitmaps/mono/rockblox_background.112x64x1.bmp apps/plugins/bitmaps/native/rockblox_background.112x64x1.bmp
apps/plugins/bitmaps/mono/rockblox_background.128x64x1.bmp apps/plugins/bitmaps/native/rockblox_background.128x64x1.bmp
apps/plugins/bitmaps/mono/rockblox_background.160x128x1.bmp apps/plugins/bitmaps/native/rockblox_background.160x128x1.bmp
+25 -12
apps/plugins/bitmaps/native/SOURCES
··· 369 369 #endif 370 370 371 371 /* Rockblox */ 372 - #if (LCD_WIDTH == 320) && (LCD_HEIGHT == 240) && (LCD_DEPTH == 16) 372 + #if LCD_DEPTH == 16 /* colour versions*/ 373 + #if (LCD_WIDTH == 320) && (LCD_HEIGHT == 240) 373 374 rockblox_background.320x240x16.bmp 374 - #elif (LCD_WIDTH == 240) && (LCD_HEIGHT == 320) && (LCD_DEPTH == 16) 375 + #elif (LCD_WIDTH == 240) && (LCD_HEIGHT == 320) 375 376 rockblox_background.240x320x16.bmp 376 - #elif (LCD_WIDTH >= 220) && (LCD_HEIGHT >= 176) && (LCD_DEPTH == 16) 377 + #elif (LCD_WIDTH == 220) && (LCD_HEIGHT == 176) 377 378 rockblox_background.220x176x16.bmp 378 - #elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 132) && (LCD_DEPTH == 16) 379 + #elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 220) 380 + rockblox_background.176x220x16.bmp 381 + #elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 132) 379 382 rockblox_background.176x132x16.bmp 380 - #elif (LCD_WIDTH == 176) && (LCD_HEIGHT == 220) && (LCD_DEPTH == 16) 381 - rockblox_background.176x220x16.bmp 382 - #elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) && (LCD_DEPTH >= 16) 383 + #elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) 383 384 rockblox_background.160x128x16.bmp 384 - #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 128) && (LCD_DEPTH == 16) 385 + #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 128) 385 386 rockblox_background.128x128x16.bmp 386 - #elif (LCD_WIDTH == 132) && (LCD_HEIGHT == 80) && (LCD_DEPTH == 16) 387 + #elif (LCD_WIDTH == 132) && (LCD_HEIGHT == 80) 387 388 rockblox_background.132x80x16.bmp 388 - #elif (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) && (LCD_DEPTH == 2) 389 + #endif 390 + #elif LCD_DEPTH == 2 /* greyscale versions */ 391 + #if (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) 389 392 rockblox_background.160x128x2.bmp 390 - #elif (LCD_WIDTH == 138) && (LCD_HEIGHT == 110) && (LCD_DEPTH == 2) 393 + #elif (LCD_WIDTH == 138) && (LCD_HEIGHT == 110) 391 394 rockblox_background.138x110x2.bmp 392 - #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96) && (LCD_DEPTH == 2) 395 + #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 96) 393 396 rockblox_background.128x96x2.bmp 394 397 #endif 398 + #elif LCD_DEPTH == 1 /* monochrome versions */ 399 + #if (LCD_WIDTH == 160) && (LCD_HEIGHT == 128) 400 + rockblox_background.160x128x1.bmp 401 + #elif (LCD_WIDTH == 128) && (LCD_HEIGHT == 64) 402 + rockblox_background.128x64x1.bmp 403 + #elif (LCD_WIDTH == 112) && (LCD_HEIGHT == 64) 404 + rockblox_background.112x64x1.bmp 405 + #endif 406 + #endif /* LCD_DEPTH */ 407 + 395 408 396 409 /* Rockpaint */ 397 410 #ifdef HAVE_LCD_COLOR