diff options
Diffstat (limited to 'apps/plugins/logo.c')
-rw-r--r-- | apps/plugins/logo.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c index aae9e54562..a7257fae4b 100644 --- a/apps/plugins/logo.c +++ b/apps/plugins/logo.c | |||
@@ -42,14 +42,12 @@ static const struct button_mapping *plugin_contexts[] | |||
42 | #define REMOTE_LOGO_WIDTH BMPWIDTH_remote_rockboxlogo | 42 | #define REMOTE_LOGO_WIDTH BMPWIDTH_remote_rockboxlogo |
43 | #define REMOTE_LOGO_HEIGHT BMPHEIGHT_remote_rockboxlogo | 43 | #define REMOTE_LOGO_HEIGHT BMPHEIGHT_remote_rockboxlogo |
44 | #define REMOTE_LOGO remote_rockboxlogo | 44 | #define REMOTE_LOGO remote_rockboxlogo |
45 | extern const fb_remote_data remote_rockboxlogo[]; | ||
46 | #endif /* HAVE_REMOTE_LCD */ | 45 | #endif /* HAVE_REMOTE_LCD */ |
47 | 46 | ||
48 | #define LOGO rockboxlogo | 47 | #define LOGO rockboxlogo |
49 | #include "pluginbitmaps/rockboxlogo.h" | 48 | #include "pluginbitmaps/rockboxlogo.h" |
50 | #define LOGO_WIDTH BMPWIDTH_rockboxlogo | 49 | #define LOGO_WIDTH BMPWIDTH_rockboxlogo |
51 | #define LOGO_HEIGHT BMPHEIGHT_rockboxlogo | 50 | #define LOGO_HEIGHT BMPHEIGHT_rockboxlogo |
52 | extern const fb_data rockboxlogo[]; | ||
53 | 51 | ||
54 | #else /* !LCD_BITMAP */ | 52 | #else /* !LCD_BITMAP */ |
55 | #define DISPLAY_WIDTH 55 | 53 | #define DISPLAY_WIDTH 55 |
@@ -103,10 +101,10 @@ enum plugin_status plugin_start(const void* parameter) { | |||
103 | while (1) { | 101 | while (1) { |
104 | #ifdef HAVE_LCD_BITMAP | 102 | #ifdef HAVE_LCD_BITMAP |
105 | rb->lcd_clear_display(); | 103 | rb->lcd_clear_display(); |
106 | rb->lcd_bitmap(LOGO, x, y, LOGO_WIDTH, LOGO_HEIGHT); | 104 | rb->lcd_bitmap((const fb_data*)LOGO, x, y, LOGO_WIDTH, LOGO_HEIGHT); |
107 | #ifdef REMOTE_LOGO | 105 | #ifdef REMOTE_LOGO |
108 | rb->lcd_remote_clear_display(); | 106 | rb->lcd_remote_clear_display(); |
109 | rb->lcd_remote_bitmap(REMOTE_LOGO, | 107 | rb->lcd_remote_bitmap((const fb_data*)REMOTE_LOGO, |
110 | (x * (REMOTE_WIDTH - REMOTE_LOGO_WIDTH)) / (DISPLAY_WIDTH - LOGO_WIDTH), | 108 | (x * (REMOTE_WIDTH - REMOTE_LOGO_WIDTH)) / (DISPLAY_WIDTH - LOGO_WIDTH), |
111 | (y * (REMOTE_HEIGHT - REMOTE_LOGO_HEIGHT)) / (DISPLAY_HEIGHT - LOGO_HEIGHT), | 109 | (y * (REMOTE_HEIGHT - REMOTE_LOGO_HEIGHT)) / (DISPLAY_HEIGHT - LOGO_HEIGHT), |
112 | REMOTE_LOGO_WIDTH, REMOTE_LOGO_HEIGHT); | 110 | REMOTE_LOGO_WIDTH, REMOTE_LOGO_HEIGHT); |
@@ -195,5 +193,3 @@ enum plugin_status plugin_start(const void* parameter) { | |||
195 | } | 193 | } |
196 | } | 194 | } |
197 | } | 195 | } |
198 | |||
199 | |||