diff options
Diffstat (limited to 'apps/plugins/logo.c')
-rw-r--r-- | apps/plugins/logo.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c index 60bed3b826..984a65aa34 100644 --- a/apps/plugins/logo.c +++ b/apps/plugins/logo.c | |||
@@ -29,7 +29,6 @@ static const struct button_mapping *plugin_contexts[] | |||
29 | #endif | 29 | #endif |
30 | }; | 30 | }; |
31 | 31 | ||
32 | #ifdef HAVE_LCD_BITMAP | ||
33 | #define DISPLAY_WIDTH LCD_WIDTH | 32 | #define DISPLAY_WIDTH LCD_WIDTH |
34 | #define DISPLAY_HEIGHT LCD_HEIGHT | 33 | #define DISPLAY_HEIGHT LCD_HEIGHT |
35 | #define RAND_SCALE 5 | 34 | #define RAND_SCALE 5 |
@@ -48,19 +47,6 @@ static const struct button_mapping *plugin_contexts[] | |||
48 | #define LOGO_WIDTH BMPWIDTH_rockboxlogo | 47 | #define LOGO_WIDTH BMPWIDTH_rockboxlogo |
49 | #define LOGO_HEIGHT BMPHEIGHT_rockboxlogo | 48 | #define LOGO_HEIGHT BMPHEIGHT_rockboxlogo |
50 | 49 | ||
51 | #else /* !LCD_BITMAP */ | ||
52 | #define DISPLAY_WIDTH 55 | ||
53 | #define DISPLAY_HEIGHT 14 | ||
54 | #define RAND_SCALE 2 | ||
55 | #define LOGO_WIDTH 16 | ||
56 | #define LOGO_HEIGHT 7 | ||
57 | #define LOGO rockbox16x7 | ||
58 | const unsigned char rockbox16x7[] = { | ||
59 | 0x47, 0x18, 0xa6, 0xd8, 0x66, 0xde, 0xb7, 0x9b, | ||
60 | 0x76, 0xdb, 0x26, 0xdb, 0x66, 0xde, | ||
61 | }; | ||
62 | #endif /* !LCD_BITMAP */ | ||
63 | |||
64 | /* We use PLA */ | 50 | /* We use PLA */ |
65 | #define LP_QUIT PLA_EXIT | 51 | #define LP_QUIT PLA_EXIT |
66 | #define LP_QUIT2 PLA_CANCEL | 52 | #define LP_QUIT2 PLA_CANCEL |
@@ -88,7 +74,6 @@ enum plugin_status plugin_start(const void* parameter) { | |||
88 | dy = rb->rand()%(2*RAND_SCALE+1) - RAND_SCALE; | 74 | dy = rb->rand()%(2*RAND_SCALE+1) - RAND_SCALE; |
89 | 75 | ||
90 | while (1) { | 76 | while (1) { |
91 | #ifdef HAVE_LCD_BITMAP | ||
92 | rb->lcd_clear_display(); | 77 | rb->lcd_clear_display(); |
93 | rb->lcd_bitmap((const fb_data*)LOGO, x, y, LOGO_WIDTH, LOGO_HEIGHT); | 78 | rb->lcd_bitmap((const fb_data*)LOGO, x, y, LOGO_WIDTH, LOGO_HEIGHT); |
94 | #ifdef REMOTE_LOGO | 79 | #ifdef REMOTE_LOGO |
@@ -98,12 +83,6 @@ enum plugin_status plugin_start(const void* parameter) { | |||
98 | (y * (REMOTE_HEIGHT - REMOTE_LOGO_HEIGHT)) / (DISPLAY_HEIGHT - LOGO_HEIGHT), | 83 | (y * (REMOTE_HEIGHT - REMOTE_LOGO_HEIGHT)) / (DISPLAY_HEIGHT - LOGO_HEIGHT), |
99 | REMOTE_LOGO_WIDTH, REMOTE_LOGO_HEIGHT); | 84 | REMOTE_LOGO_WIDTH, REMOTE_LOGO_HEIGHT); |
100 | #endif | 85 | #endif |
101 | #else | ||
102 | pgfx_clear_display(); | ||
103 | pgfx_mono_bitmap(LOGO, x % 5, y, LOGO_WIDTH, LOGO_HEIGHT); | ||
104 | cpos = x / 5; | ||
105 | #endif | ||
106 | |||
107 | x += dx; | 86 | x += dx; |
108 | if (x < 0) { | 87 | if (x < 0) { |
109 | dx = -dx; | 88 | dx = -dx; |
@@ -124,19 +103,10 @@ enum plugin_status plugin_start(const void* parameter) { | |||
124 | y = DISPLAY_HEIGHT - LOGO_HEIGHT; | 103 | y = DISPLAY_HEIGHT - LOGO_HEIGHT; |
125 | } | 104 | } |
126 | 105 | ||
127 | #ifdef HAVE_LCD_BITMAP | ||
128 | rb->lcd_update(); | 106 | rb->lcd_update(); |
129 | #ifdef REMOTE_LOGO | 107 | #ifdef REMOTE_LOGO |
130 | rb->lcd_remote_update(); | 108 | rb->lcd_remote_update(); |
131 | #endif | 109 | #endif |
132 | #else | ||
133 | if (cpos != old_cpos) { | ||
134 | rb->lcd_clear_display(); | ||
135 | pgfx_display(cpos, 0); | ||
136 | old_cpos = cpos; | ||
137 | } | ||
138 | pgfx_update(); | ||
139 | #endif | ||
140 | rb->sleep(HZ/timer); | 110 | rb->sleep(HZ/timer); |
141 | 111 | ||
142 | 112 | ||