diff -Naur ./rockbox.unmod/apps/plugins/bubbles.c ./rockbox.mod/apps/plugins/bubbles.c --- ./rockbox.unmod/apps/plugins/bubbles.c 2011-01-22 09:02:17.000000000 -0600 +++ ./rockbox.mod/apps/plugins/bubbles.c 2011-01-23 19:06:10.000000000 -0600 @@ -112,24 +112,17 @@ /* bubbles will consume height of ROW_HEIGHT*(BB_HEIGHT-1)+BUBBLE_HEIGHT*3/2 */ /* 44x44 bubbles (m:robe 500) */ -#if (LCD_WIDTH == 640) && (LCD_HEIGHT == 480) -#define XOFS 144 -#define MAX_FPS 40 -#elif (LCD_WIDTH == 480) && (LCD_HEIGHT == 640) -#define XOFS 128 -#define MAX_FPS 40 +/* 22x22 bubbles (Gigabeat, Onda VX747) */ +#if ((LCD_HEIGHT == 320) || (LCD_HEIGHT == 400)) && (LCD_WIDTH == 240) +#define XOFS 64 +#define MAX_FPS 30 /* 22x22 bubbles (iPod Video) */ #elif (LCD_HEIGHT == 240) && (LCD_WIDTH == 320) #define XOFS 72 #define MAX_FPS 40 -/* 22x22 bubbles (Gigabeat, Onda VX747) */ -#elif ((LCD_HEIGHT == 320) || (LCD_HEIGHT == 400)) && (LCD_WIDTH == 240) -#define XOFS 64 -#define MAX_FPS 30 - /* 16x16 bubbles (H300, iPod Color, HDD6330) */ #elif (LCD_HEIGHT == 176) && (LCD_WIDTH == 220) #define XOFS 46 @@ -209,6 +202,19 @@ #define ROW_HEIGHT 5 #define MAX_FPS 20 +/* width 640 or more */ +#elif (LCD_WIDTH >= 640) +#define XOFS 144 +#define MAX_FPS 40 +/* width 480 to 639 */ +#elif (LCD_WIDTH >= 480) && (LCD_WIDTH < 640) +#define XOFS 128 +#define MAX_FPS 40 +/* width 240 to 479 */ +#elif (LCD_WIDTH >= 240) && (LCD_WIDTH < 480) +#define XOFS 72 +#define MAX_FPS 40 + #else #error BUBBLES: Unsupported LCD type #endif