diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-07-17 10:31:31 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-07-24 21:20:13 +0000 |
commit | 658026e6267277b27d297c481728f74d160a8481 (patch) | |
tree | 915a9d2bb48469bdd5b9127dc19a61f230721a6c /apps/gui | |
parent | 8cb555460ff79e636a7907fb2589e16db98c8600 (diff) | |
download | rockbox-658026e6267277b27d297c481728f74d160a8481.tar.gz rockbox-658026e6267277b27d297c481728f74d160a8481.zip |
[4/4] Remove HAVE_LCD_BITMAP, as it's now the only choice.
Note: I left behind lcd_bitmap in features.txt, because removing it
would require considerable work in the manual and the translations.
Change-Id: Ia8ca7761f610d9332a0d22a7d189775fb15ec88a
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/bitmap/list-skinned.c | 6 | ||||
-rw-r--r-- | apps/gui/icon.c | 4 | ||||
-rw-r--r-- | apps/gui/icon.h | 4 | ||||
-rw-r--r-- | apps/gui/line.c | 2 | ||||
-rw-r--r-- | apps/gui/list.c | 44 | ||||
-rw-r--r-- | apps/gui/list.h | 8 | ||||
-rw-r--r-- | apps/gui/scrollbar.c | 3 | ||||
-rw-r--r-- | apps/gui/scrollbar.h | 3 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_display.c | 19 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_display.h | 2 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_engine.c | 10 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_engine.h | 5 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 53 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_render.c | 38 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_tokens.c | 6 | ||||
-rw-r--r-- | apps/gui/skin_engine/wps_internals.h | 14 | ||||
-rw-r--r-- | apps/gui/splash.c | 22 | ||||
-rw-r--r-- | apps/gui/statusbar-skinned.h | 11 | ||||
-rw-r--r-- | apps/gui/statusbar.c | 12 | ||||
-rw-r--r-- | apps/gui/usb_screen.c | 27 | ||||
-rw-r--r-- | apps/gui/viewport.c | 30 | ||||
-rw-r--r-- | apps/gui/viewport.h | 3 | ||||
-rw-r--r-- | apps/gui/wps.c | 7 | ||||
-rw-r--r-- | apps/gui/yesno.c | 2 |
24 files changed, 15 insertions, 320 deletions
diff --git a/apps/gui/bitmap/list-skinned.c b/apps/gui/bitmap/list-skinned.c index d6b868ae26..f0396263f3 100644 --- a/apps/gui/bitmap/list-skinned.c +++ b/apps/gui/bitmap/list-skinned.c | |||
@@ -236,7 +236,7 @@ bool skinlist_draw(struct screen *display, struct gui_synclist *list) | |||
236 | int cols = (parent->width / listcfg[screen]->width); | 236 | int cols = (parent->width / listcfg[screen]->width); |
237 | current_column = (cur_line)%cols; | 237 | current_column = (cur_line)%cols; |
238 | current_row = (cur_line)/cols; | 238 | current_row = (cur_line)/cols; |
239 | 239 | ||
240 | skin_viewport->vp.x = parent->x + listcfg[screen]->width*current_column + original_x; | 240 | skin_viewport->vp.x = parent->x + listcfg[screen]->width*current_column + original_x; |
241 | skin_viewport->vp.y = parent->y + listcfg[screen]->height*current_row + original_y; | 241 | skin_viewport->vp.y = parent->y + listcfg[screen]->height*current_row + original_y; |
242 | } | 242 | } |
@@ -249,7 +249,6 @@ bool skinlist_draw(struct screen *display, struct gui_synclist *list) | |||
249 | (listcfg[screen]->height*cur_line); | 249 | (listcfg[screen]->height*cur_line); |
250 | } | 250 | } |
251 | display->set_viewport(&skin_viewport->vp); | 251 | display->set_viewport(&skin_viewport->vp); |
252 | #ifdef HAVE_LCD_BITMAP | ||
253 | /* Set images to not to be displayed */ | 252 | /* Set images to not to be displayed */ |
254 | struct skin_token_list *imglist = SKINOFFSETTOPTR(get_skin_buffer(wps.data), wps.data->images); | 253 | struct skin_token_list *imglist = SKINOFFSETTOPTR(get_skin_buffer(wps.data), wps.data->images); |
255 | while (imglist) | 254 | while (imglist) |
@@ -259,13 +258,10 @@ bool skinlist_draw(struct screen *display, struct gui_synclist *list) | |||
259 | img->display = -1; | 258 | img->display = -1; |
260 | imglist = SKINOFFSETTOPTR(get_skin_buffer(wps.data), imglist->next); | 259 | imglist = SKINOFFSETTOPTR(get_skin_buffer(wps.data), imglist->next); |
261 | } | 260 | } |
262 | #endif | ||
263 | struct skin_element** children = SKINOFFSETTOPTR(get_skin_buffer(wps.data), viewport->children); | 261 | struct skin_element** children = SKINOFFSETTOPTR(get_skin_buffer(wps.data), viewport->children); |
264 | skin_render_viewport(SKINOFFSETTOPTR(get_skin_buffer(wps.data), (intptr_t)children[0]), | 262 | skin_render_viewport(SKINOFFSETTOPTR(get_skin_buffer(wps.data), (intptr_t)children[0]), |
265 | &wps, skin_viewport, SKIN_REFRESH_ALL); | 263 | &wps, skin_viewport, SKIN_REFRESH_ALL); |
266 | #ifdef HAVE_LCD_BITMAP | ||
267 | wps_display_images(&wps, &skin_viewport->vp); | 264 | wps_display_images(&wps, &skin_viewport->vp); |
268 | #endif | ||
269 | /* force disableing scroll because it breaks later */ | 265 | /* force disableing scroll because it breaks later */ |
270 | if (!is_selected) | 266 | if (!is_selected) |
271 | { | 267 | { |
diff --git a/apps/gui/icon.c b/apps/gui/icon.c index db3ae2c96b..5190c54ea5 100644 --- a/apps/gui/icon.c +++ b/apps/gui/icon.c | |||
@@ -144,11 +144,7 @@ void screen_put_iconxy(struct screen * display, | |||
144 | 144 | ||
145 | void screen_put_cursorxy(struct screen * display, int x, int y, bool on) | 145 | void screen_put_cursorxy(struct screen * display, int x, int y, bool on) |
146 | { | 146 | { |
147 | #ifdef HAVE_LCD_BITMAP | ||
148 | screen_put_icon(display, x, y, on?Icon_Cursor:0); | 147 | screen_put_icon(display, x, y, on?Icon_Cursor:0); |
149 | #else | ||
150 | screen_put_icon(display, x, y, on?CURSOR_CHAR:-1); | ||
151 | #endif | ||
152 | } | 148 | } |
153 | 149 | ||
154 | static int buflib_move_callback(int handle, void* current, void* new) | 150 | static int buflib_move_callback(int handle, void* current, void* new) |
diff --git a/apps/gui/icon.h b/apps/gui/icon.h index 88449c61ca..4165391316 100644 --- a/apps/gui/icon.h +++ b/apps/gui/icon.h | |||
@@ -24,11 +24,7 @@ | |||
24 | #include "screen_access.h" | 24 | #include "screen_access.h" |
25 | /* Defines a type for the icons since it's not the same thing on | 25 | /* Defines a type for the icons since it's not the same thing on |
26 | * char-based displays and bitmap displays */ | 26 | * char-based displays and bitmap displays */ |
27 | #ifdef HAVE_LCD_BITMAP | ||
28 | typedef const unsigned char * ICON; | 27 | typedef const unsigned char * ICON; |
29 | #else | ||
30 | typedef long ICON; | ||
31 | #endif | ||
32 | 28 | ||
33 | /* Don't #ifdef icon values, or we wont be able to use the same | 29 | /* Don't #ifdef icon values, or we wont be able to use the same |
34 | bmp for every target. */ | 30 | bmp for every target. */ |
diff --git a/apps/gui/line.c b/apps/gui/line.c index ea6bcea93b..d319ff3c51 100644 --- a/apps/gui/line.c +++ b/apps/gui/line.c | |||
@@ -294,7 +294,6 @@ next: | |||
294 | } | 294 | } |
295 | } | 295 | } |
296 | 296 | ||
297 | #ifdef HAVE_LCD_BITMAP | ||
298 | static void style_line(struct screen *display, | 297 | static void style_line(struct screen *display, |
299 | int x, int y, struct line_desc *line) | 298 | int x, int y, struct line_desc *line) |
300 | { | 299 | { |
@@ -380,7 +379,6 @@ static void style_line(struct screen *display, | |||
380 | } | 379 | } |
381 | #endif | 380 | #endif |
382 | } | 381 | } |
383 | #endif /* HAVE_LCD_BITMAP */ | ||
384 | 382 | ||
385 | void vput_line(struct screen *display, | 383 | void vput_line(struct screen *display, |
386 | int x, int y, struct line_desc *line, | 384 | int x, int y, struct line_desc *line, |
diff --git a/apps/gui/list.c b/apps/gui/list.c index b1120aa794..ee4684233f 100644 --- a/apps/gui/list.c +++ b/apps/gui/list.c | |||
@@ -47,17 +47,14 @@ | |||
47 | */ | 47 | */ |
48 | #define FRAMEDROP_TRIGGER 6 | 48 | #define FRAMEDROP_TRIGGER 6 |
49 | 49 | ||
50 | #ifdef HAVE_LCD_BITMAP | ||
51 | static int offset_step = 16; /* pixels per screen scroll step */ | 50 | static int offset_step = 16; /* pixels per screen scroll step */ |
52 | /* should lines scroll out of the screen */ | 51 | /* should lines scroll out of the screen */ |
53 | static bool offset_out_of_view = false; | 52 | static bool offset_out_of_view = false; |
54 | #endif | ||
55 | 53 | ||
56 | static void gui_list_select_at_offset(struct gui_synclist * gui_list, | 54 | static void gui_list_select_at_offset(struct gui_synclist * gui_list, |
57 | int offset); | 55 | int offset); |
58 | void list_draw(struct screen *display, struct gui_synclist *list); | 56 | void list_draw(struct screen *display, struct gui_synclist *list); |
59 | 57 | ||
60 | #ifdef HAVE_LCD_BITMAP | ||
61 | static long last_dirty_tick; | 58 | static long last_dirty_tick; |
62 | static struct viewport parent[NB_SCREENS]; | 59 | static struct viewport parent[NB_SCREENS]; |
63 | 60 | ||
@@ -92,23 +89,7 @@ static void list_init_viewports(struct gui_synclist *list) | |||
92 | } | 89 | } |
93 | list->dirty_tick = current_tick; | 90 | list->dirty_tick = current_tick; |
94 | } | 91 | } |
95 | #else | ||
96 | static struct viewport parent[NB_SCREENS] = | ||
97 | { | ||
98 | [SCREEN_MAIN] = | ||
99 | { | ||
100 | .x = 0, | ||
101 | .y = 0, | ||
102 | .width = LCD_WIDTH, | ||
103 | .height = LCD_HEIGHT | ||
104 | }, | ||
105 | }; | ||
106 | |||
107 | #define list_init_viewports(a) | ||
108 | #define list_is_dirty(a) false | ||
109 | #endif | ||
110 | 92 | ||
111 | #ifdef HAVE_LCD_BITMAP | ||
112 | static int list_nb_lines(struct gui_synclist *list, enum screen_type screen) | 93 | static int list_nb_lines(struct gui_synclist *list, enum screen_type screen) |
113 | { | 94 | { |
114 | struct viewport *vp = list->parent[screen]; | 95 | struct viewport *vp = list->parent[screen]; |
@@ -148,13 +129,6 @@ void list_init_item_height(struct gui_synclist *list, enum screen_type screen) | |||
148 | #endif | 129 | #endif |
149 | } | 130 | } |
150 | 131 | ||
151 | #else | ||
152 | #define list_display_title(l, i) false | ||
153 | #define list_get_nb_lines(list, screen) \ | ||
154 | viewport_get_nb_lines((list)->parent[(screen)]); | ||
155 | #define list_init_item_height(l, i) | ||
156 | #endif | ||
157 | |||
158 | /* | 132 | /* |
159 | * Initializes a scrolling list | 133 | * Initializes a scrolling list |
160 | * - gui_list : the list structure to initialize | 134 | * - gui_list : the list structure to initialize |
@@ -181,9 +155,7 @@ void gui_synclist_init(struct gui_synclist * gui_list, | |||
181 | FOR_NB_SCREENS(i) | 155 | FOR_NB_SCREENS(i) |
182 | { | 156 | { |
183 | gui_list->start_item[i] = 0; | 157 | gui_list->start_item[i] = 0; |
184 | #ifdef HAVE_LCD_BITMAP | ||
185 | gui_list->offset_position[i] = 0; | 158 | gui_list->offset_position[i] = 0; |
186 | #endif | ||
187 | if (list_parent) | 159 | if (list_parent) |
188 | gui_list->parent[i] = &list_parent[i]; | 160 | gui_list->parent[i] = &list_parent[i]; |
189 | else | 161 | else |
@@ -216,7 +188,6 @@ void gui_synclist_hide_selection_marker(struct gui_synclist * lists, bool hide) | |||
216 | } | 188 | } |
217 | 189 | ||
218 | 190 | ||
219 | #ifdef HAVE_LCD_BITMAP | ||
220 | int gui_list_get_item_offset(struct gui_synclist * gui_list, | 191 | int gui_list_get_item_offset(struct gui_synclist * gui_list, |
221 | int item_width, | 192 | int item_width, |
222 | int text_pos, | 193 | int text_pos, |
@@ -248,7 +219,6 @@ int gui_list_get_item_offset(struct gui_synclist * gui_list, | |||
248 | 219 | ||
249 | return item_offset; | 220 | return item_offset; |
250 | } | 221 | } |
251 | #endif | ||
252 | 222 | ||
253 | /* | 223 | /* |
254 | * Force a full screen update. | 224 | * Force a full screen update. |
@@ -264,9 +234,7 @@ void gui_synclist_draw(struct gui_synclist *gui_list) | |||
264 | } | 234 | } |
265 | FOR_NB_SCREENS(i) | 235 | FOR_NB_SCREENS(i) |
266 | { | 236 | { |
267 | #ifdef HAVE_LCD_BITMAP | ||
268 | if (!skinlist_draw(&screens[i], gui_list)) | 237 | if (!skinlist_draw(&screens[i], gui_list)) |
269 | #endif | ||
270 | list_draw(&screens[i], gui_list); | 238 | list_draw(&screens[i], gui_list); |
271 | } | 239 | } |
272 | } | 240 | } |
@@ -481,7 +449,6 @@ void gui_synclist_del_item(struct gui_synclist * gui_list) | |||
481 | } | 449 | } |
482 | } | 450 | } |
483 | 451 | ||
484 | #ifdef HAVE_LCD_BITMAP | ||
485 | void gui_list_screen_scroll_step(int ofs) | 452 | void gui_list_screen_scroll_step(int ofs) |
486 | { | 453 | { |
487 | offset_step = ofs; | 454 | offset_step = ofs; |
@@ -491,7 +458,6 @@ void gui_list_screen_scroll_out_of_view(bool enable) | |||
491 | { | 458 | { |
492 | offset_out_of_view = enable; | 459 | offset_out_of_view = enable; |
493 | } | 460 | } |
494 | #endif /* HAVE_LCD_BITMAP */ | ||
495 | 461 | ||
496 | /* | 462 | /* |
497 | * Set the title and title icon of the list. Setting title to NULL disables | 463 | * Set the title and title icon of the list. Setting title to NULL disables |
@@ -502,22 +468,18 @@ void gui_synclist_set_title(struct gui_synclist * gui_list, | |||
502 | { | 468 | { |
503 | gui_list->title = title; | 469 | gui_list->title = title; |
504 | gui_list->title_icon = icon; | 470 | gui_list->title_icon = icon; |
505 | #ifdef HAVE_LCD_BITMAP | ||
506 | FOR_NB_SCREENS(i) | 471 | FOR_NB_SCREENS(i) |
507 | sb_set_title_text(title, icon, i); | 472 | sb_set_title_text(title, icon, i); |
508 | #endif | ||
509 | send_event(GUI_EVENT_ACTIONUPDATE, (void*)1); | 473 | send_event(GUI_EVENT_ACTIONUPDATE, (void*)1); |
510 | } | 474 | } |
511 | 475 | ||
512 | void gui_synclist_set_nb_items(struct gui_synclist * lists, int nb_items) | 476 | void gui_synclist_set_nb_items(struct gui_synclist * lists, int nb_items) |
513 | { | 477 | { |
514 | lists->nb_items = nb_items; | 478 | lists->nb_items = nb_items; |
515 | #ifdef HAVE_LCD_BITMAP | ||
516 | FOR_NB_SCREENS(i) | 479 | FOR_NB_SCREENS(i) |
517 | { | 480 | { |
518 | lists->offset_position[i] = 0; | 481 | lists->offset_position[i] = 0; |
519 | } | 482 | } |
520 | #endif | ||
521 | } | 483 | } |
522 | int gui_synclist_get_nb_items(struct gui_synclist * lists) | 484 | int gui_synclist_get_nb_items(struct gui_synclist * lists) |
523 | { | 485 | { |
@@ -576,7 +538,6 @@ void gui_synclist_limit_scroll(struct gui_synclist * lists, bool scroll) | |||
576 | lists->limit_scroll = scroll; | 538 | lists->limit_scroll = scroll; |
577 | } | 539 | } |
578 | 540 | ||
579 | #ifdef HAVE_LCD_BITMAP | ||
580 | /* | 541 | /* |
581 | * Makes all the item in the list scroll by one step to the right. | 542 | * Makes all the item in the list scroll by one step to the right. |
582 | * Should stop increasing the value when reaching the widest item value | 543 | * Should stop increasing the value when reaching the widest item value |
@@ -608,7 +569,6 @@ static void gui_synclist_scroll_left(struct gui_synclist * lists) | |||
608 | lists->offset_position[i] = 0; | 569 | lists->offset_position[i] = 0; |
609 | } | 570 | } |
610 | } | 571 | } |
611 | #endif /* HAVE_LCD_BITMAP */ | ||
612 | 572 | ||
613 | bool gui_synclist_keyclick_callback(int action, void* data) | 573 | bool gui_synclist_keyclick_callback(int action, void* data) |
614 | { | 574 | { |
@@ -652,9 +612,7 @@ bool gui_synclist_do_button(struct gui_synclist * lists, | |||
652 | int *actionptr, enum list_wrap wrap) | 612 | int *actionptr, enum list_wrap wrap) |
653 | { | 613 | { |
654 | int action = *actionptr; | 614 | int action = *actionptr; |
655 | #ifdef HAVE_LCD_BITMAP | ||
656 | static bool pgleft_allow_cancel = false; | 615 | static bool pgleft_allow_cancel = false; |
657 | #endif | ||
658 | 616 | ||
659 | #ifdef HAVE_WHEEL_ACCELERATION | 617 | #ifdef HAVE_WHEEL_ACCELERATION |
660 | int next_item_modifier = button_apply_acceleration(get_action_data()); | 618 | int next_item_modifier = button_apply_acceleration(get_action_data()); |
@@ -753,7 +711,6 @@ bool gui_synclist_do_button(struct gui_synclist * lists, | |||
753 | *actionptr = ACTION_STD_NEXT; | 711 | *actionptr = ACTION_STD_NEXT; |
754 | return true; | 712 | return true; |
755 | 713 | ||
756 | #ifdef HAVE_LCD_BITMAP | ||
757 | case ACTION_TREE_PGRIGHT: | 714 | case ACTION_TREE_PGRIGHT: |
758 | gui_synclist_scroll_right(lists); | 715 | gui_synclist_scroll_right(lists); |
759 | gui_synclist_draw(lists); | 716 | gui_synclist_draw(lists); |
@@ -784,7 +741,6 @@ bool gui_synclist_do_button(struct gui_synclist * lists, | |||
784 | pgleft_allow_cancel = false; /* stop ACTION_TREE_PAGE_LEFT | 741 | pgleft_allow_cancel = false; /* stop ACTION_TREE_PAGE_LEFT |
785 | skipping to root */ | 742 | skipping to root */ |
786 | return true; | 743 | return true; |
787 | #endif | ||
788 | /* for pgup / pgdown, we are obliged to have a different behaviour depending | 744 | /* for pgup / pgdown, we are obliged to have a different behaviour depending |
789 | * on the screen for which the user pressed the key since for example, remote | 745 | * on the screen for which the user pressed the key since for example, remote |
790 | * and main screen doesn't have the same number of lines */ | 746 | * and main screen doesn't have the same number of lines */ |
diff --git a/apps/gui/list.h b/apps/gui/list.h index 9107bf0591..f860e27bf9 100644 --- a/apps/gui/list.h +++ b/apps/gui/list.h | |||
@@ -102,9 +102,7 @@ struct gui_synclist | |||
102 | int selected_size; | 102 | int selected_size; |
103 | /* the number of pixels each line occupies (including optional padding on touchscreen */ | 103 | /* the number of pixels each line occupies (including optional padding on touchscreen */ |
104 | int line_height[NB_SCREENS]; | 104 | int line_height[NB_SCREENS]; |
105 | #ifdef HAVE_LCD_BITMAP | ||
106 | int offset_position[NB_SCREENS]; /* the list's screen scroll placement in pixels */ | 105 | int offset_position[NB_SCREENS]; /* the list's screen scroll placement in pixels */ |
107 | #endif | ||
108 | long scheduled_talk_tick, last_talked_tick, dirty_tick; | 106 | long scheduled_talk_tick, last_talked_tick, dirty_tick; |
109 | 107 | ||
110 | list_get_icon *callback_get_item_icon; | 108 | list_get_icon *callback_get_item_icon; |
@@ -127,14 +125,12 @@ struct gui_synclist | |||
127 | }; | 125 | }; |
128 | 126 | ||
129 | 127 | ||
130 | #ifdef HAVE_LCD_BITMAP | ||
131 | extern void list_init(void); | 128 | extern void list_init(void); |
132 | /* parse global setting to static int */ | 129 | /* parse global setting to static int */ |
133 | extern void gui_list_screen_scroll_step(int ofs); | 130 | extern void gui_list_screen_scroll_step(int ofs); |
134 | 131 | ||
135 | /* parse global setting to static bool */ | 132 | /* parse global setting to static bool */ |
136 | extern void gui_list_screen_scroll_out_of_view(bool enable); | 133 | extern void gui_list_screen_scroll_out_of_view(bool enable); |
137 | #endif /* HAVE_LCD_BITMAP */ | ||
138 | 134 | ||
139 | extern void gui_synclist_init( | 135 | extern void gui_synclist_init( |
140 | struct gui_synclist * lists, | 136 | struct gui_synclist * lists, |
@@ -179,7 +175,7 @@ extern bool gui_synclist_keyclick_callback(int action, void* data); | |||
179 | extern bool gui_synclist_do_button(struct gui_synclist * lists, | 175 | extern bool gui_synclist_do_button(struct gui_synclist * lists, |
180 | int *action, | 176 | int *action, |
181 | enum list_wrap); | 177 | enum list_wrap); |
182 | #if defined(HAVE_LCD_BITMAP) && !defined(PLUGIN) | 178 | #if !defined(PLUGIN) |
183 | struct listitem_viewport_cfg { | 179 | struct listitem_viewport_cfg { |
184 | struct wps_data *data; | 180 | struct wps_data *data; |
185 | OFFSETTYPE(char *) label; | 181 | OFFSETTYPE(char *) label; |
@@ -204,7 +200,7 @@ enum themable_icons skinlist_get_item_icon(int offset, bool wrap); | |||
204 | bool skinlist_needs_scrollbar(enum screen_type screen); | 200 | bool skinlist_needs_scrollbar(enum screen_type screen); |
205 | void skinlist_get_scrollbar(int* nb_item, int* first_shown, int* last_shown); | 201 | void skinlist_get_scrollbar(int* nb_item, int* first_shown, int* last_shown); |
206 | int skinlist_get_line_count(enum screen_type screen, struct gui_synclist *list); | 202 | int skinlist_get_line_count(enum screen_type screen, struct gui_synclist *list); |
207 | #endif | 203 | #endif /* !PLUGIN) */ |
208 | 204 | ||
209 | #if defined(HAVE_TOUCHSCREEN) | 205 | #if defined(HAVE_TOUCHSCREEN) |
210 | /* this needs to be fixed if we ever get more than 1 touchscreen on a target */ | 206 | /* this needs to be fixed if we ever get more than 1 touchscreen on a target */ |
diff --git a/apps/gui/scrollbar.c b/apps/gui/scrollbar.c index 2e4bd8580c..532659e580 100644 --- a/apps/gui/scrollbar.c +++ b/apps/gui/scrollbar.c | |||
@@ -20,7 +20,6 @@ | |||
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | 21 | ||
22 | #include "scrollbar.h" | 22 | #include "scrollbar.h" |
23 | #ifdef HAVE_LCD_BITMAP | ||
24 | #include "config.h" | 23 | #include "config.h" |
25 | #include "limits.h" | 24 | #include "limits.h" |
26 | #include "bmp.h" | 25 | #include "bmp.h" |
@@ -264,5 +263,3 @@ void show_busy_slider(struct screen *s, int x, int y, int width, int height) | |||
264 | dir = 1; | 263 | dir = 1; |
265 | } | 264 | } |
266 | } | 265 | } |
267 | |||
268 | #endif /* HAVE_LCD_BITMAP */ | ||
diff --git a/apps/gui/scrollbar.h b/apps/gui/scrollbar.h index dcaef5721d..fa0907c686 100644 --- a/apps/gui/scrollbar.h +++ b/apps/gui/scrollbar.h | |||
@@ -23,8 +23,6 @@ | |||
23 | #define _GUI_SCROLLBAR_H_ | 23 | #define _GUI_SCROLLBAR_H_ |
24 | #include "screen_access.h" | 24 | #include "screen_access.h" |
25 | 25 | ||
26 | #ifdef HAVE_LCD_BITMAP | ||
27 | |||
28 | enum orientation { | 26 | enum orientation { |
29 | VERTICAL = 0x0000, /* Vertical orientation */ | 27 | VERTICAL = 0x0000, /* Vertical orientation */ |
30 | HORIZONTAL = 0x0001, /* Horizontal orientation */ | 28 | HORIZONTAL = 0x0001, /* Horizontal orientation */ |
@@ -64,5 +62,4 @@ extern void gui_bitmap_scrollbar_draw(struct screen * screen, struct bitmap *bm, | |||
64 | unsigned flags); | 62 | unsigned flags); |
65 | extern void show_busy_slider(struct screen *s, int x, int y, | 63 | extern void show_busy_slider(struct screen *s, int x, int y, |
66 | int width, int height); | 64 | int width, int height); |
67 | #endif /* HAVE_LCD_BITMAP */ | ||
68 | #endif /* _GUI_SCROLLBAR_H_ */ | 65 | #endif /* _GUI_SCROLLBAR_H_ */ |
diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c index 345d74b65c..bd3a2b40aa 100644 --- a/apps/gui/skin_engine/skin_display.c +++ b/apps/gui/skin_engine/skin_display.c | |||
@@ -47,14 +47,12 @@ | |||
47 | #include "list.h" | 47 | #include "list.h" |
48 | #include "option_select.h" | 48 | #include "option_select.h" |
49 | 49 | ||
50 | #ifdef HAVE_LCD_BITMAP | ||
51 | #include "peakmeter.h" | 50 | #include "peakmeter.h" |
52 | /* Image stuff */ | 51 | /* Image stuff */ |
53 | #include "bmp.h" | 52 | #include "bmp.h" |
54 | #ifdef HAVE_ALBUMART | 53 | #ifdef HAVE_ALBUMART |
55 | #include "albumart.h" | 54 | #include "albumart.h" |
56 | #endif | 55 | #endif |
57 | #endif | ||
58 | 56 | ||
59 | #include "cuesheet.h" | 57 | #include "cuesheet.h" |
60 | #include "playback.h" | 58 | #include "playback.h" |
@@ -93,9 +91,6 @@ void skin_update(enum skinnable_screens skin, enum screen_type screen, | |||
93 | SKIN_REFRESH_ALL : update_type); | 91 | SKIN_REFRESH_ALL : update_type); |
94 | } | 92 | } |
95 | 93 | ||
96 | #ifdef HAVE_LCD_BITMAP | ||
97 | |||
98 | |||
99 | #ifdef AB_REPEAT_ENABLE | 94 | #ifdef AB_REPEAT_ENABLE |
100 | 95 | ||
101 | #define DIRECTION_RIGHT 1 | 96 | #define DIRECTION_RIGHT 1 |
@@ -171,7 +166,7 @@ void draw_progressbar(struct gui_wps *gwps, int line, struct progressbar *pb) | |||
171 | int x = pb->x, y = pb->y, width = pb->width, height = pb->height; | 166 | int x = pb->x, y = pb->y, width = pb->width, height = pb->height; |
172 | unsigned long length, end; | 167 | unsigned long length, end; |
173 | int flags = HORIZONTAL; | 168 | int flags = HORIZONTAL; |
174 | 169 | ||
175 | if (height < 0) | 170 | if (height < 0) |
176 | height = font_get(vp->font)->height; | 171 | height = font_get(vp->font)->height; |
177 | 172 | ||
@@ -423,8 +418,6 @@ void wps_display_images(struct gui_wps *gwps, struct viewport* vp) | |||
423 | display->set_drawmode(DRMODE_SOLID); | 418 | display->set_drawmode(DRMODE_SOLID); |
424 | } | 419 | } |
425 | 420 | ||
426 | #endif /* HAVE_LCD_BITMAP */ | ||
427 | |||
428 | /* Evaluate the conditional that is at *token_index and return whether a skip | 421 | /* Evaluate the conditional that is at *token_index and return whether a skip |
429 | has ocurred. *token_index is updated with the new position. | 422 | has ocurred. *token_index is updated with the new position. |
430 | */ | 423 | */ |
@@ -587,21 +580,17 @@ void write_line(struct screen *display, struct align_pos *format_align, | |||
587 | else | 580 | else |
588 | { | 581 | { |
589 | linedes->scroll = false; | 582 | linedes->scroll = false; |
590 | #ifdef HAVE_LCD_BITMAP | ||
591 | /* clear the line first */ | 583 | /* clear the line first */ |
592 | display->set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID); | 584 | display->set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID); |
593 | display->fillrect(0, line*string_height, viewport_width, string_height); | 585 | display->fillrect(0, line*string_height, viewport_width, string_height); |
594 | display->set_drawmode(DRMODE_SOLID); | 586 | display->set_drawmode(DRMODE_SOLID); |
595 | #endif | ||
596 | 587 | ||
597 | /* Nasty hack: we output an empty scrolling string, | 588 | /* Nasty hack: we output an empty scrolling string, |
598 | which will reset the scroller for that line */ | 589 | which will reset the scroller for that line */ |
599 | display->puts_scroll(0, line, (unsigned char *)""); | 590 | display->puts_scroll(0, line, (unsigned char *)""); |
600 | #ifdef HAVE_LCD_BITMAP | ||
601 | line *= string_height; | 591 | line *= string_height; |
602 | center_xpos = (viewport_width-center_width)/2; | 592 | center_xpos = (viewport_width-center_width)/2; |
603 | right_xpos = viewport_width-right_width; | 593 | right_xpos = viewport_width-right_width; |
604 | #endif | ||
605 | /* print aligned strings. print whole line at once so that %Vs works | 594 | /* print aligned strings. print whole line at once so that %Vs works |
606 | * across the full viewport width */ | 595 | * across the full viewport width */ |
607 | char *left = format_align->left ?: ""; | 596 | char *left = format_align->left ?: ""; |
@@ -614,7 +603,6 @@ void write_line(struct screen *display, struct align_pos *format_align, | |||
614 | } | 603 | } |
615 | } | 604 | } |
616 | 605 | ||
617 | #ifdef HAVE_LCD_BITMAP | ||
618 | void draw_peakmeters(struct gui_wps *gwps, int line_number, | 606 | void draw_peakmeters(struct gui_wps *gwps, int line_number, |
619 | struct viewport *viewport) | 607 | struct viewport *viewport) |
620 | { | 608 | { |
@@ -645,15 +633,12 @@ bool skin_has_sbs(enum screen_type screen, struct wps_data *data) | |||
645 | (void)screen; | 633 | (void)screen; |
646 | (void)data; | 634 | (void)data; |
647 | bool draw = false; | 635 | bool draw = false; |
648 | #ifdef HAVE_LCD_BITMAP | ||
649 | if (data->wps_sb_tag) | 636 | if (data->wps_sb_tag) |
650 | draw = data->show_sb_on_wps; | 637 | draw = data->show_sb_on_wps; |
651 | else if (statusbar_position(screen) != STATUSBAR_OFF) | 638 | else if (statusbar_position(screen) != STATUSBAR_OFF) |
652 | draw = true; | 639 | draw = true; |
653 | #endif | ||
654 | return draw; | 640 | return draw; |
655 | } | 641 | } |
656 | #endif | ||
657 | 642 | ||
658 | /* do the button loop as often as required for the peak meters to update | 643 | /* do the button loop as often as required for the peak meters to update |
659 | * with a good refresh rate. | 644 | * with a good refresh rate. |
@@ -661,7 +646,6 @@ bool skin_has_sbs(enum screen_type screen, struct wps_data *data) | |||
661 | int skin_wait_for_action(enum skinnable_screens skin, int context, int timeout) | 646 | int skin_wait_for_action(enum skinnable_screens skin, int context, int timeout) |
662 | { | 647 | { |
663 | int button = ACTION_NONE; | 648 | int button = ACTION_NONE; |
664 | #ifdef HAVE_LCD_BITMAP | ||
665 | /* when the peak meter is enabled we want to have a | 649 | /* when the peak meter is enabled we want to have a |
666 | few extra updates to make it look smooth. On the | 650 | few extra updates to make it look smooth. On the |
667 | other hand we don't want to waste energy if it | 651 | other hand we don't want to waste energy if it |
@@ -700,7 +684,6 @@ int skin_wait_for_action(enum skinnable_screens skin, int context, int timeout) | |||
700 | /* The peak meter is disabled | 684 | /* The peak meter is disabled |
701 | -> no additional screen updates needed */ | 685 | -> no additional screen updates needed */ |
702 | else | 686 | else |
703 | #endif | ||
704 | { | 687 | { |
705 | button = get_action(context, timeout); | 688 | button = get_action(context, timeout); |
706 | } | 689 | } |
diff --git a/apps/gui/skin_engine/skin_display.h b/apps/gui/skin_engine/skin_display.h index 01a2169952..de1b0b20b5 100644 --- a/apps/gui/skin_engine/skin_display.h +++ b/apps/gui/skin_engine/skin_display.h | |||
@@ -29,7 +29,6 @@ | |||
29 | #define _SKIN_DISPLAY_H_ | 29 | #define _SKIN_DISPLAY_H_ |
30 | 30 | ||
31 | 31 | ||
32 | #ifdef HAVE_LCD_BITMAP | ||
33 | void draw_progressbar(struct gui_wps *gwps, int line, struct progressbar *pb); | 32 | void draw_progressbar(struct gui_wps *gwps, int line, struct progressbar *pb); |
34 | void draw_playlist_viewer_list(struct gui_wps *gwps, struct playlistviewer *viewer); | 33 | void draw_playlist_viewer_list(struct gui_wps *gwps, struct playlistviewer *viewer); |
35 | /* clears the area where the image was shown */ | 34 | /* clears the area where the image was shown */ |
@@ -40,7 +39,6 @@ void wps_display_images(struct gui_wps *gwps, struct viewport* vp); | |||
40 | void skin_render_viewport(struct skin_element* viewport, struct gui_wps *gwps, | 39 | void skin_render_viewport(struct skin_element* viewport, struct gui_wps *gwps, |
41 | struct skin_viewport* skin_viewport, unsigned long refresh_type); | 40 | struct skin_viewport* skin_viewport, unsigned long refresh_type); |
42 | 41 | ||
43 | #endif | ||
44 | 42 | ||
45 | /* Evaluate the conditional that is at *token_index and return whether a skip | 43 | /* Evaluate the conditional that is at *token_index and return whether a skip |
46 | has ocurred. *token_index is updated with the new position. | 44 | has ocurred. *token_index is updated with the new position. |
diff --git a/apps/gui/skin_engine/skin_engine.c b/apps/gui/skin_engine/skin_engine.c index ec4e1fd073..cd763def1c 100644 --- a/apps/gui/skin_engine/skin_engine.c +++ b/apps/gui/skin_engine/skin_engine.c | |||
@@ -56,9 +56,7 @@ static struct gui_skin_helper { | |||
56 | char* (*default_skin)(enum screen_type screen); | 56 | char* (*default_skin)(enum screen_type screen); |
57 | bool load_on_boot; | 57 | bool load_on_boot; |
58 | } skin_helpers[SKINNABLE_SCREENS_COUNT] = { | 58 | } skin_helpers[SKINNABLE_SCREENS_COUNT] = { |
59 | #ifdef HAVE_LCD_BITMAP | ||
60 | [CUSTOM_STATUSBAR] = { sb_preproccess, sb_postproccess, sb_create_from_settings, true }, | 59 | [CUSTOM_STATUSBAR] = { sb_preproccess, sb_postproccess, sb_create_from_settings, true }, |
61 | #endif | ||
62 | [WPS] = { NULL, NULL, wps_default_skin, true }, | 60 | [WPS] = { NULL, NULL, wps_default_skin, true }, |
63 | #if CONFIG_TUNER | 61 | #if CONFIG_TUNER |
64 | [FM_SCREEN] = { NULL, NULL, default_radio_skin, false } | 62 | [FM_SCREEN] = { NULL, NULL, default_radio_skin, false } |
@@ -115,10 +113,8 @@ static void gui_skin_reset(struct gui_skin *skin) | |||
115 | #ifdef HAVE_SKIN_VARIABLES | 113 | #ifdef HAVE_SKIN_VARIABLES |
116 | skin->data.skinvars = -1; | 114 | skin->data.skinvars = -1; |
117 | #endif | 115 | #endif |
118 | #ifdef HAVE_LCD_BITMAP | ||
119 | skin->data.font_ids = -1; | 116 | skin->data.font_ids = -1; |
120 | skin->data.images = -1; | 117 | skin->data.images = -1; |
121 | #endif | ||
122 | #ifdef HAVE_ALBUMART | 118 | #ifdef HAVE_ALBUMART |
123 | skin->data.albumart = -1; | 119 | skin->data.albumart = -1; |
124 | skin->data.playback_aa_slot = -1; | 120 | skin->data.playback_aa_slot = -1; |
@@ -157,9 +153,7 @@ void settings_apply_skins(void) | |||
157 | char filename[MAX_PATH]; | 153 | char filename[MAX_PATH]; |
158 | static bool first_run = true; | 154 | static bool first_run = true; |
159 | 155 | ||
160 | #ifdef HAVE_LCD_BITMAP | ||
161 | skin_backdrop_init(); | 156 | skin_backdrop_init(); |
162 | #endif | ||
163 | skins_initialised = true; | 157 | skins_initialised = true; |
164 | 158 | ||
165 | /* Make sure each skin is loaded */ | 159 | /* Make sure each skin is loaded */ |
@@ -236,7 +230,6 @@ static char* get_skin_filename(char *buf, size_t buf_size, | |||
236 | char *setting = NULL, *ext = NULL; | 230 | char *setting = NULL, *ext = NULL; |
237 | switch (skin) | 231 | switch (skin) |
238 | { | 232 | { |
239 | #ifdef HAVE_LCD_BITMAP | ||
240 | case CUSTOM_STATUSBAR: | 233 | case CUSTOM_STATUSBAR: |
241 | #if defined(HAVE_REMOTE_LCD) && NB_SCREENS > 1 | 234 | #if defined(HAVE_REMOTE_LCD) && NB_SCREENS > 1 |
242 | if (screen == SCREEN_REMOTE) | 235 | if (screen == SCREEN_REMOTE) |
@@ -251,7 +244,6 @@ static char* get_skin_filename(char *buf, size_t buf_size, | |||
251 | ext = "sbs"; | 244 | ext = "sbs"; |
252 | } | 245 | } |
253 | break; | 246 | break; |
254 | #endif | ||
255 | case WPS: | 247 | case WPS: |
256 | #if defined(HAVE_REMOTE_LCD) && NB_SCREENS > 1 | 248 | #if defined(HAVE_REMOTE_LCD) && NB_SCREENS > 1 |
257 | if (screen == SCREEN_REMOTE) | 249 | if (screen == SCREEN_REMOTE) |
@@ -296,10 +288,8 @@ static char* get_skin_filename(char *buf, size_t buf_size, | |||
296 | 288 | ||
297 | struct gui_wps *skin_get_gwps(enum skinnable_screens skin, enum screen_type screen) | 289 | struct gui_wps *skin_get_gwps(enum skinnable_screens skin, enum screen_type screen) |
298 | { | 290 | { |
299 | #ifdef HAVE_LCD_BITMAP | ||
300 | if (skin == CUSTOM_STATUSBAR && !skins_initialised) | 291 | if (skin == CUSTOM_STATUSBAR && !skins_initialised) |
301 | return &skins[skin][screen].gui_wps; | 292 | return &skins[skin][screen].gui_wps; |
302 | #endif | ||
303 | 293 | ||
304 | if (skins[skin][screen].data.wps_loaded == false) | 294 | if (skins[skin][screen].data.wps_loaded == false) |
305 | { | 295 | { |
diff --git a/apps/gui/skin_engine/skin_engine.h b/apps/gui/skin_engine/skin_engine.h index 59e00b5176..55839608be 100644 --- a/apps/gui/skin_engine/skin_engine.h +++ b/apps/gui/skin_engine/skin_engine.h | |||
@@ -30,15 +30,12 @@ | |||
30 | #include "wps_internals.h" /* TODO: remove this line.. shoudlnt be needed */ | 30 | #include "wps_internals.h" /* TODO: remove this line.. shoudlnt be needed */ |
31 | 31 | ||
32 | enum skinnable_screens { | 32 | enum skinnable_screens { |
33 | #ifdef HAVE_LCD_BITMAP | ||
34 | CUSTOM_STATUSBAR, | 33 | CUSTOM_STATUSBAR, |
35 | #endif | ||
36 | WPS, | 34 | WPS, |
37 | #if CONFIG_TUNER | 35 | #if CONFIG_TUNER |
38 | FM_SCREEN, | 36 | FM_SCREEN, |
39 | #endif | 37 | #endif |
40 | 38 | ||
41 | |||
42 | SKINNABLE_SCREENS_COUNT | 39 | SKINNABLE_SCREENS_COUNT |
43 | }; | 40 | }; |
44 | 41 | ||
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index de7c1db372..f3a23377ef 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c | |||
@@ -66,9 +66,7 @@ | |||
66 | #include "tuner.h" | 66 | #include "tuner.h" |
67 | #endif | 67 | #endif |
68 | 68 | ||
69 | #ifdef HAVE_LCD_BITMAP | ||
70 | #include "bmp.h" | 69 | #include "bmp.h" |
71 | #endif | ||
72 | 70 | ||
73 | #ifdef HAVE_ALBUMART | 71 | #ifdef HAVE_ALBUMART |
74 | #include "playback.h" | 72 | #include "playback.h" |
@@ -127,7 +125,6 @@ typedef int (*parse_function)(struct skin_element *element, | |||
127 | struct wps_token *token, | 125 | struct wps_token *token, |
128 | struct wps_data *wps_data); | 126 | struct wps_data *wps_data); |
129 | 127 | ||
130 | #ifdef HAVE_LCD_BITMAP | ||
131 | /* add a skin_token_list item to the list chain. ALWAYS appended because some of the | 128 | /* add a skin_token_list item to the list chain. ALWAYS appended because some of the |
132 | * chains require the order to be kept. | 129 | * chains require the order to be kept. |
133 | */ | 130 | */ |
@@ -147,9 +144,6 @@ static void add_to_ll_chain(OFFSETTYPE(struct skin_token_list *) *listoffset, | |||
147 | } | 144 | } |
148 | } | 145 | } |
149 | 146 | ||
150 | #endif | ||
151 | |||
152 | |||
153 | void *skin_find_item(const char *label, enum skin_find_what what, | 147 | void *skin_find_item(const char *label, enum skin_find_what what, |
154 | struct wps_data *data) | 148 | struct wps_data *data) |
155 | { | 149 | { |
@@ -170,11 +164,9 @@ void *skin_find_item(const char *label, enum skin_find_what what, | |||
170 | list.vplist = SKINOFFSETTOPTR(databuf, data->tree); | 164 | list.vplist = SKINOFFSETTOPTR(databuf, data->tree); |
171 | isvplist = true; | 165 | isvplist = true; |
172 | break; | 166 | break; |
173 | #ifdef HAVE_LCD_BITMAP | ||
174 | case SKIN_FIND_IMAGE: | 167 | case SKIN_FIND_IMAGE: |
175 | list.linkedlist = SKINOFFSETTOPTR(databuf, data->images); | 168 | list.linkedlist = SKINOFFSETTOPTR(databuf, data->images); |
176 | break; | 169 | break; |
177 | #endif | ||
178 | #ifdef HAVE_TOUCHSCREEN | 170 | #ifdef HAVE_TOUCHSCREEN |
179 | case SKIN_FIND_TOUCHREGION: | 171 | case SKIN_FIND_TOUCHREGION: |
180 | list.linkedlist = SKINOFFSETTOPTR(databuf, data->touchregions); | 172 | list.linkedlist = SKINOFFSETTOPTR(databuf, data->touchregions); |
@@ -190,11 +182,9 @@ void *skin_find_item(const char *label, enum skin_find_what what, | |||
190 | while (list.linkedlist) | 182 | while (list.linkedlist) |
191 | { | 183 | { |
192 | bool skip = false; | 184 | bool skip = false; |
193 | #ifdef HAVE_LCD_BITMAP | ||
194 | struct wps_token *token = NULL; | 185 | struct wps_token *token = NULL; |
195 | if (!isvplist) | 186 | if (!isvplist) |
196 | token = SKINOFFSETTOPTR(databuf, list.linkedlist->token); | 187 | token = SKINOFFSETTOPTR(databuf, list.linkedlist->token); |
197 | #endif | ||
198 | switch (what) | 188 | switch (what) |
199 | { | 189 | { |
200 | case SKIN_FIND_UIVP: | 190 | case SKIN_FIND_UIVP: |
@@ -207,12 +197,10 @@ void *skin_find_item(const char *label, enum skin_find_what what, | |||
207 | skip = !(((struct skin_viewport *)ret)->is_infovp == | 197 | skip = !(((struct skin_viewport *)ret)->is_infovp == |
208 | (what==SKIN_FIND_UIVP)); | 198 | (what==SKIN_FIND_UIVP)); |
209 | break; | 199 | break; |
210 | #ifdef HAVE_LCD_BITMAP | ||
211 | case SKIN_FIND_IMAGE: | 200 | case SKIN_FIND_IMAGE: |
212 | ret = SKINOFFSETTOPTR(databuf, token->value.data); | 201 | ret = SKINOFFSETTOPTR(databuf, token->value.data); |
213 | itemlabel = SKINOFFSETTOPTR(databuf, ((struct gui_img *)ret)->label); | 202 | itemlabel = SKINOFFSETTOPTR(databuf, ((struct gui_img *)ret)->label); |
214 | break; | 203 | break; |
215 | #endif | ||
216 | #ifdef HAVE_TOUCHSCREEN | 204 | #ifdef HAVE_TOUCHSCREEN |
217 | case SKIN_FIND_TOUCHREGION: | 205 | case SKIN_FIND_TOUCHREGION: |
218 | ret = SKINOFFSETTOPTR(databuf, token->value.data); | 206 | ret = SKINOFFSETTOPTR(databuf, token->value.data); |
@@ -240,8 +228,6 @@ void *skin_find_item(const char *label, enum skin_find_what what, | |||
240 | return NULL; | 228 | return NULL; |
241 | } | 229 | } |
242 | 230 | ||
243 | #ifdef HAVE_LCD_BITMAP | ||
244 | |||
245 | /* create and init a new wpsll item. | 231 | /* create and init a new wpsll item. |
246 | * passing NULL to token will alloc a new one. | 232 | * passing NULL to token will alloc a new one. |
247 | * You should only pass NULL for the token when the token type (table above) | 233 | * You should only pass NULL for the token when the token type (table above) |
@@ -493,9 +479,6 @@ static int parse_font_load(struct skin_element *element, | |||
493 | return 0; | 479 | return 0; |
494 | } | 480 | } |
495 | 481 | ||
496 | |||
497 | #ifdef HAVE_LCD_BITMAP | ||
498 | |||
499 | static int parse_playlistview(struct skin_element *element, | 482 | static int parse_playlistview(struct skin_element *element, |
500 | struct wps_token *token, | 483 | struct wps_token *token, |
501 | struct wps_data *wps_data) | 484 | struct wps_data *wps_data) |
@@ -513,7 +496,7 @@ static int parse_playlistview(struct skin_element *element, | |||
513 | 496 | ||
514 | return 0; | 497 | return 0; |
515 | } | 498 | } |
516 | #endif | 499 | |
517 | #ifdef HAVE_LCD_COLOR | 500 | #ifdef HAVE_LCD_COLOR |
518 | static int parse_viewport_gradient_setup(struct skin_element *element, | 501 | static int parse_viewport_gradient_setup(struct skin_element *element, |
519 | struct wps_token *token, | 502 | struct wps_token *token, |
@@ -756,8 +739,6 @@ static int parse_image_special(struct skin_element *element, | |||
756 | } | 739 | } |
757 | #endif | 740 | #endif |
758 | 741 | ||
759 | #endif /* HAVE_LCD_BITMAP */ | ||
760 | |||
761 | static int parse_progressbar_tag(struct skin_element* element, | 742 | static int parse_progressbar_tag(struct skin_element* element, |
762 | struct wps_token *token, | 743 | struct wps_token *token, |
763 | struct wps_data *wps_data); | 744 | struct wps_data *wps_data); |
@@ -898,7 +879,6 @@ static int parse_progressbar_tag(struct skin_element* element, | |||
898 | struct wps_token *token, | 879 | struct wps_token *token, |
899 | struct wps_data *wps_data) | 880 | struct wps_data *wps_data) |
900 | { | 881 | { |
901 | #ifdef HAVE_LCD_BITMAP | ||
902 | struct progressbar *pb; | 882 | struct progressbar *pb; |
903 | struct viewport *vp = &curr_vp->vp; | 883 | struct viewport *vp = &curr_vp->vp; |
904 | struct skin_tag_parameter *param = get_param(element, 0); | 884 | struct skin_tag_parameter *param = get_param(element, 0); |
@@ -1211,20 +1191,7 @@ static int parse_progressbar_tag(struct skin_element* element, | |||
1211 | add_to_ll_chain(&wps_data->touchregions, item); | 1191 | add_to_ll_chain(&wps_data->touchregions, item); |
1212 | } | 1192 | } |
1213 | #endif | 1193 | #endif |
1214 | |||
1215 | return 0; | ||
1216 | |||
1217 | #else | ||
1218 | (void)element; | ||
1219 | if (token->type == SKIN_TOKEN_PROGRESSBAR || | ||
1220 | token->type == SKIN_TOKEN_PLAYER_PROGRESSBAR) | ||
1221 | { | ||
1222 | wps_data->full_line_progressbar = | ||
1223 | token->type == SKIN_TOKEN_PLAYER_PROGRESSBAR; | ||
1224 | } | ||
1225 | return 0; | 1194 | return 0; |
1226 | |||
1227 | #endif | ||
1228 | } | 1195 | } |
1229 | 1196 | ||
1230 | #ifdef HAVE_ALBUMART | 1197 | #ifdef HAVE_ALBUMART |
@@ -1741,7 +1708,6 @@ void skin_data_free_buflib_allocs(struct wps_data *wps_data) | |||
1741 | { | 1708 | { |
1742 | if (wps_data->wps_loaded) | 1709 | if (wps_data->wps_loaded) |
1743 | skin_buffer = get_skin_buffer(wps_data); | 1710 | skin_buffer = get_skin_buffer(wps_data); |
1744 | #ifdef HAVE_LCD_BITMAP | ||
1745 | #ifndef __PCTOOL__ | 1711 | #ifndef __PCTOOL__ |
1746 | struct skin_token_list *list = SKINOFFSETTOPTR(skin_buffer, wps_data->images); | 1712 | struct skin_token_list *list = SKINOFFSETTOPTR(skin_buffer, wps_data->images); |
1747 | int *font_ids = SKINOFFSETTOPTR(skin_buffer, wps_data->font_ids); | 1713 | int *font_ids = SKINOFFSETTOPTR(skin_buffer, wps_data->font_ids); |
@@ -1776,7 +1742,6 @@ void skin_data_free_buflib_allocs(struct wps_data *wps_data) | |||
1776 | core_free(wps_data->buflib_handle); | 1742 | core_free(wps_data->buflib_handle); |
1777 | wps_data->buflib_handle = -1; | 1743 | wps_data->buflib_handle = -1; |
1778 | #endif | 1744 | #endif |
1779 | #endif | ||
1780 | } | 1745 | } |
1781 | 1746 | ||
1782 | /* | 1747 | /* |
@@ -1787,9 +1752,7 @@ void skin_data_free_buflib_allocs(struct wps_data *wps_data) | |||
1787 | static void skin_data_reset(struct wps_data *wps_data) | 1752 | static void skin_data_reset(struct wps_data *wps_data) |
1788 | { | 1753 | { |
1789 | skin_data_free_buflib_allocs(wps_data); | 1754 | skin_data_free_buflib_allocs(wps_data); |
1790 | #ifdef HAVE_LCD_BITMAP | ||
1791 | wps_data->images = INVALID_OFFSET; | 1755 | wps_data->images = INVALID_OFFSET; |
1792 | #endif | ||
1793 | wps_data->tree = INVALID_OFFSET; | 1756 | wps_data->tree = INVALID_OFFSET; |
1794 | #ifdef HAVE_BACKDROP_IMAGE | 1757 | #ifdef HAVE_BACKDROP_IMAGE |
1795 | if (wps_data->backdrop_id >= 0) | 1758 | if (wps_data->backdrop_id >= 0) |
@@ -1811,15 +1774,12 @@ static void skin_data_reset(struct wps_data *wps_data) | |||
1811 | } | 1774 | } |
1812 | #endif | 1775 | #endif |
1813 | 1776 | ||
1814 | #ifdef HAVE_LCD_BITMAP | ||
1815 | wps_data->peak_meter_enabled = false; | 1777 | wps_data->peak_meter_enabled = false; |
1816 | wps_data->wps_sb_tag = false; | 1778 | wps_data->wps_sb_tag = false; |
1817 | wps_data->show_sb_on_wps = false; | 1779 | wps_data->show_sb_on_wps = false; |
1818 | #endif | ||
1819 | wps_data->wps_loaded = false; | 1780 | wps_data->wps_loaded = false; |
1820 | } | 1781 | } |
1821 | 1782 | ||
1822 | #ifdef HAVE_LCD_BITMAP | ||
1823 | #ifndef __PCTOOL__ | 1783 | #ifndef __PCTOOL__ |
1824 | static int currently_loading_handle = -1; | 1784 | static int currently_loading_handle = -1; |
1825 | static int buflib_move_callback(int handle, void* current, void* new) | 1785 | static int buflib_move_callback(int handle, void* current, void* new) |
@@ -2065,7 +2025,6 @@ static bool skin_load_fonts(struct wps_data *data) | |||
2065 | return success; | 2025 | return success; |
2066 | } | 2026 | } |
2067 | 2027 | ||
2068 | #endif /* HAVE_LCD_BITMAP */ | ||
2069 | static int convert_viewport(struct wps_data *data, struct skin_element* element) | 2028 | static int convert_viewport(struct wps_data *data, struct skin_element* element) |
2070 | { | 2029 | { |
2071 | struct skin_viewport *skin_vp = skin_buffer_alloc(sizeof(*skin_vp)); | 2030 | struct skin_viewport *skin_vp = skin_buffer_alloc(sizeof(*skin_vp)); |
@@ -2176,11 +2135,9 @@ static int convert_viewport(struct wps_data *data, struct skin_element* element) | |||
2176 | skin_vp->vp.height = display->lcdheight - skin_vp->vp.y; | 2135 | skin_vp->vp.height = display->lcdheight - skin_vp->vp.y; |
2177 | } | 2136 | } |
2178 | param++; | 2137 | param++; |
2179 | #ifdef HAVE_LCD_BITMAP | ||
2180 | /* font */ | 2138 | /* font */ |
2181 | if (!isdefault(param)) | 2139 | if (!isdefault(param)) |
2182 | skin_vp->parsed_fontid = param->data.number; | 2140 | skin_vp->parsed_fontid = param->data.number; |
2183 | #endif | ||
2184 | if ((unsigned) skin_vp->vp.x >= (unsigned) display->lcdwidth || | 2141 | if ((unsigned) skin_vp->vp.x >= (unsigned) display->lcdwidth || |
2185 | skin_vp->vp.width + skin_vp->vp.x > display->lcdwidth || | 2142 | skin_vp->vp.width + skin_vp->vp.x > display->lcdwidth || |
2186 | (unsigned) skin_vp->vp.y >= (unsigned) display->lcdheight || | 2143 | (unsigned) skin_vp->vp.y >= (unsigned) display->lcdheight || |
@@ -2259,7 +2216,6 @@ static int skin_element_callback(struct skin_element* element, void* data) | |||
2259 | case SKIN_TOKEN_TRACK_ENDING: | 2216 | case SKIN_TOKEN_TRACK_ENDING: |
2260 | function = parse_timeout_tag; | 2217 | function = parse_timeout_tag; |
2261 | break; | 2218 | break; |
2262 | #ifdef HAVE_LCD_BITMAP | ||
2263 | case SKIN_TOKEN_LIST_ITEM_TEXT: | 2219 | case SKIN_TOKEN_LIST_ITEM_TEXT: |
2264 | case SKIN_TOKEN_LIST_ITEM_ICON: | 2220 | case SKIN_TOKEN_LIST_ITEM_ICON: |
2265 | function = parse_listitem; | 2221 | function = parse_listitem; |
@@ -2274,7 +2230,6 @@ static int skin_element_callback(struct skin_element* element, void* data) | |||
2274 | sb_skin_has_title(curr_screen); | 2230 | sb_skin_has_title(curr_screen); |
2275 | #endif | 2231 | #endif |
2276 | break; | 2232 | break; |
2277 | #endif | ||
2278 | #if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1)) | 2233 | #if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1)) |
2279 | case SKIN_TOKEN_DRAWRECTANGLE: | 2234 | case SKIN_TOKEN_DRAWRECTANGLE: |
2280 | function = parse_drawrectangle; | 2235 | function = parse_drawrectangle; |
@@ -2309,7 +2264,6 @@ static int skin_element_callback(struct skin_element* element, void* data) | |||
2309 | case SKIN_TOKEN_SETTING: | 2264 | case SKIN_TOKEN_SETTING: |
2310 | function = parse_setting_and_lang; | 2265 | function = parse_setting_and_lang; |
2311 | break; | 2266 | break; |
2312 | #ifdef HAVE_LCD_BITMAP | ||
2313 | case SKIN_TOKEN_VIEWPORT_CUSTOMLIST: | 2267 | case SKIN_TOKEN_VIEWPORT_CUSTOMLIST: |
2314 | function = parse_playlistview; | 2268 | function = parse_playlistview; |
2315 | break; | 2269 | break; |
@@ -2331,7 +2285,6 @@ static int skin_element_callback(struct skin_element* element, void* data) | |||
2331 | case SKIN_TOKEN_LIST_ITEM_CFG: | 2285 | case SKIN_TOKEN_LIST_ITEM_CFG: |
2332 | function = parse_listitemviewport; | 2286 | function = parse_listitemviewport; |
2333 | break; | 2287 | break; |
2334 | #endif | ||
2335 | #ifdef HAVE_TOUCHSCREEN | 2288 | #ifdef HAVE_TOUCHSCREEN |
2336 | case SKIN_TOKEN_TOUCHREGION: | 2289 | case SKIN_TOKEN_TOUCHREGION: |
2337 | function = parse_touchregion; | 2290 | function = parse_touchregion; |
@@ -2423,14 +2376,12 @@ bool skin_data_load(enum screen_type screen, struct wps_data *wps_data, | |||
2423 | char *wps_buffer = NULL; | 2376 | char *wps_buffer = NULL; |
2424 | if (!wps_data || !buf) | 2377 | if (!wps_data || !buf) |
2425 | return false; | 2378 | return false; |
2426 | #ifdef HAVE_LCD_BITMAP | ||
2427 | int i; | 2379 | int i; |
2428 | for (i=0;i<MAXUSERFONTS;i++) | 2380 | for (i=0;i<MAXUSERFONTS;i++) |
2429 | { | 2381 | { |
2430 | skinfonts[i].id = -1; | 2382 | skinfonts[i].id = -1; |
2431 | skinfonts[i].name = NULL; | 2383 | skinfonts[i].name = NULL; |
2432 | } | 2384 | } |
2433 | #endif | ||
2434 | #ifdef DEBUG_SKIN_ENGINE | 2385 | #ifdef DEBUG_SKIN_ENGINE |
2435 | if (isfile && debug_wps) | 2386 | if (isfile && debug_wps) |
2436 | { | 2387 | { |
@@ -2504,7 +2455,6 @@ bool skin_data_load(enum screen_type screen, struct wps_data *wps_data, | |||
2504 | return false; | 2455 | return false; |
2505 | } | 2456 | } |
2506 | 2457 | ||
2507 | #ifdef HAVE_LCD_BITMAP | ||
2508 | char bmpdir[MAX_PATH]; | 2458 | char bmpdir[MAX_PATH]; |
2509 | if (isfile) | 2459 | if (isfile) |
2510 | { | 2460 | { |
@@ -2523,7 +2473,6 @@ bool skin_data_load(enum screen_type screen, struct wps_data *wps_data, | |||
2523 | skin_data_reset(wps_data); | 2473 | skin_data_reset(wps_data); |
2524 | return false; | 2474 | return false; |
2525 | } | 2475 | } |
2526 | #endif | ||
2527 | #if defined(HAVE_ALBUMART) && !defined(__PCTOOL__) | 2476 | #if defined(HAVE_ALBUMART) && !defined(__PCTOOL__) |
2528 | /* last_albumart_{width,height} is either both 0 or valid AA dimensions */ | 2477 | /* last_albumart_{width,height} is either both 0 or valid AA dimensions */ |
2529 | struct skin_albumart *aa = SKINOFFSETTOPTR(skin_buffer, wps_data->albumart); | 2478 | struct skin_albumart *aa = SKINOFFSETTOPTR(skin_buffer, wps_data->albumart); |
diff --git a/apps/gui/skin_engine/skin_render.c b/apps/gui/skin_engine/skin_render.c index e14c882dd9..51c58fc196 100644 --- a/apps/gui/skin_engine/skin_render.c +++ b/apps/gui/skin_engine/skin_render.c | |||
@@ -77,12 +77,10 @@ struct skin_draw_info { | |||
77 | typedef bool (*skin_render_func)(struct skin_element* alternator, struct skin_draw_info *info); | 77 | typedef bool (*skin_render_func)(struct skin_element* alternator, struct skin_draw_info *info); |
78 | bool skin_render_alternator(struct skin_element* alternator, struct skin_draw_info *info); | 78 | bool skin_render_alternator(struct skin_element* alternator, struct skin_draw_info *info); |
79 | 79 | ||
80 | #ifdef HAVE_LCD_BITMAP | ||
81 | static void skin_render_playlistviewer(struct playlistviewer* viewer, | 80 | static void skin_render_playlistviewer(struct playlistviewer* viewer, |
82 | struct gui_wps *gwps, | 81 | struct gui_wps *gwps, |
83 | struct skin_viewport* skin_viewport, | 82 | struct skin_viewport* skin_viewport, |
84 | unsigned long refresh_type); | 83 | unsigned long refresh_type); |
85 | #endif | ||
86 | 84 | ||
87 | static char* skin_buffer; | 85 | static char* skin_buffer; |
88 | 86 | ||
@@ -99,11 +97,10 @@ static bool do_non_text_tags(struct gui_wps *gwps, struct skin_draw_info *info, | |||
99 | { | 97 | { |
100 | struct wps_token *token = (struct wps_token *)SKINOFFSETTOPTR(skin_buffer, element->data); | 98 | struct wps_token *token = (struct wps_token *)SKINOFFSETTOPTR(skin_buffer, element->data); |
101 | 99 | ||
102 | #ifdef HAVE_LCD_BITMAP | ||
103 | struct viewport *vp = &skin_vp->vp; | 100 | struct viewport *vp = &skin_vp->vp; |
104 | struct wps_data *data = gwps->data; | 101 | struct wps_data *data = gwps->data; |
105 | bool do_refresh = (element->tag->flags & info->refresh_type) > 0; | 102 | bool do_refresh = (element->tag->flags & info->refresh_type) > 0; |
106 | #endif | 103 | |
107 | switch (token->type) | 104 | switch (token->type) |
108 | { | 105 | { |
109 | #if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1)) | 106 | #if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1)) |
@@ -181,7 +178,6 @@ static bool do_non_text_tags(struct gui_wps *gwps, struct skin_draw_info *info, | |||
181 | } | 178 | } |
182 | } | 179 | } |
183 | break; | 180 | break; |
184 | #ifdef HAVE_LCD_BITMAP | ||
185 | case SKIN_TOKEN_LIST_ITEM_CFG: | 181 | case SKIN_TOKEN_LIST_ITEM_CFG: |
186 | skinlist_set_cfg(gwps->display->screen_type, | 182 | skinlist_set_cfg(gwps->display->screen_type, |
187 | SKINOFFSETTOPTR(skin_buffer, token->value.data)); | 183 | SKINOFFSETTOPTR(skin_buffer, token->value.data)); |
@@ -225,11 +221,9 @@ static bool do_non_text_tags(struct gui_wps *gwps, struct skin_draw_info *info, | |||
225 | case SKIN_TOKEN_PEAKMETER_RIGHTBAR: | 221 | case SKIN_TOKEN_PEAKMETER_RIGHTBAR: |
226 | data->peak_meter_enabled = true; | 222 | data->peak_meter_enabled = true; |
227 | /* fall through to the progressbar code */ | 223 | /* fall through to the progressbar code */ |
228 | #endif | ||
229 | case SKIN_TOKEN_VOLUMEBAR: | 224 | case SKIN_TOKEN_VOLUMEBAR: |
230 | case SKIN_TOKEN_BATTERY_PERCENTBAR: | 225 | case SKIN_TOKEN_BATTERY_PERCENTBAR: |
231 | case SKIN_TOKEN_SETTINGBAR: | 226 | case SKIN_TOKEN_SETTINGBAR: |
232 | #ifdef HAVE_LCD_BITMAP | ||
233 | case SKIN_TOKEN_PROGRESSBAR: | 227 | case SKIN_TOKEN_PROGRESSBAR: |
234 | case SKIN_TOKEN_TUNER_RSSI_BAR: | 228 | case SKIN_TOKEN_TUNER_RSSI_BAR: |
235 | case SKIN_TOKEN_LIST_SCROLLBAR: | 229 | case SKIN_TOKEN_LIST_SCROLLBAR: |
@@ -238,9 +232,7 @@ static bool do_non_text_tags(struct gui_wps *gwps, struct skin_draw_info *info, | |||
238 | if (do_refresh) | 232 | if (do_refresh) |
239 | draw_progressbar(gwps, info->line_number, bar); | 233 | draw_progressbar(gwps, info->line_number, bar); |
240 | } | 234 | } |
241 | #endif | ||
242 | break; | 235 | break; |
243 | #ifdef HAVE_LCD_BITMAP | ||
244 | case SKIN_TOKEN_IMAGE_DISPLAY: | 236 | case SKIN_TOKEN_IMAGE_DISPLAY: |
245 | { | 237 | { |
246 | struct gui_img *img = SKINOFFSETTOPTR(skin_buffer, token->value.data); | 238 | struct gui_img *img = SKINOFFSETTOPTR(skin_buffer, token->value.data); |
@@ -321,8 +313,7 @@ static bool do_non_text_tags(struct gui_wps *gwps, struct skin_draw_info *info, | |||
321 | skin_render_playlistviewer(SKINOFFSETTOPTR(skin_buffer, token->value.data), gwps, | 313 | skin_render_playlistviewer(SKINOFFSETTOPTR(skin_buffer, token->value.data), gwps, |
322 | info->skin_vp, info->refresh_type); | 314 | info->skin_vp, info->refresh_type); |
323 | break; | 315 | break; |
324 | 316 | ||
325 | #endif /* HAVE_LCD_BITMAP */ | ||
326 | #ifdef HAVE_SKIN_VARIABLES | 317 | #ifdef HAVE_SKIN_VARIABLES |
327 | case SKIN_TOKEN_VAR_SET: | 318 | case SKIN_TOKEN_VAR_SET: |
328 | { | 319 | { |
@@ -352,16 +343,12 @@ static bool do_non_text_tags(struct gui_wps *gwps, struct skin_draw_info *info, | |||
352 | } | 343 | } |
353 | return true; | 344 | return true; |
354 | } | 345 | } |
355 | |||
356 | |||
357 | 346 | ||
358 | static void do_tags_in_hidden_conditional(struct skin_element* branch, | 347 | static void do_tags_in_hidden_conditional(struct skin_element* branch, |
359 | struct skin_draw_info *info) | 348 | struct skin_draw_info *info) |
360 | { | 349 | { |
361 | #ifdef HAVE_LCD_BITMAP | ||
362 | struct gui_wps *gwps = info->gwps; | 350 | struct gui_wps *gwps = info->gwps; |
363 | struct wps_data *data = gwps->data; | 351 | struct wps_data *data = gwps->data; |
364 | #endif | ||
365 | /* Tags here are ones which need to be "turned off" or cleared | 352 | /* Tags here are ones which need to be "turned off" or cleared |
366 | * if they are in a conditional branch which isnt being used */ | 353 | * if they are in a conditional branch which isnt being used */ |
367 | if (branch->type == LINE_ALTERNATOR) | 354 | if (branch->type == LINE_ALTERNATOR) |
@@ -375,9 +362,7 @@ static void do_tags_in_hidden_conditional(struct skin_element* branch, | |||
375 | else if (branch->type == LINE && branch->children_count) | 362 | else if (branch->type == LINE && branch->children_count) |
376 | { | 363 | { |
377 | struct skin_element *child = get_child(branch->children, 0); | 364 | struct skin_element *child = get_child(branch->children, 0); |
378 | #if defined(HAVE_LCD_BITMAP) || defined(HAVE_ALBUMART) | ||
379 | struct wps_token *token; | 365 | struct wps_token *token; |
380 | #endif | ||
381 | while (child) | 366 | while (child) |
382 | { | 367 | { |
383 | if (child->type == CONDITIONAL) | 368 | if (child->type == CONDITIONAL) |
@@ -395,10 +380,7 @@ static void do_tags_in_hidden_conditional(struct skin_element* branch, | |||
395 | child = SKINOFFSETTOPTR(skin_buffer, child->next); | 380 | child = SKINOFFSETTOPTR(skin_buffer, child->next); |
396 | continue; | 381 | continue; |
397 | } | 382 | } |
398 | #if defined(HAVE_LCD_BITMAP) || defined(HAVE_ALBUMART) | ||
399 | token = (struct wps_token *)SKINOFFSETTOPTR(skin_buffer, child->data); | 383 | token = (struct wps_token *)SKINOFFSETTOPTR(skin_buffer, child->data); |
400 | #endif | ||
401 | #ifdef HAVE_LCD_BITMAP | ||
402 | /* clear all pictures in the conditional and nested ones */ | 384 | /* clear all pictures in the conditional and nested ones */ |
403 | if (token->type == SKIN_TOKEN_IMAGE_PRELOAD_DISPLAY) | 385 | if (token->type == SKIN_TOKEN_IMAGE_PRELOAD_DISPLAY) |
404 | { | 386 | { |
@@ -420,7 +402,6 @@ static void do_tags_in_hidden_conditional(struct skin_element* branch, | |||
420 | viewport = SKINOFFSETTOPTR(skin_buffer, viewport->next)) | 402 | viewport = SKINOFFSETTOPTR(skin_buffer, viewport->next)) |
421 | { | 403 | { |
422 | struct skin_viewport *skin_viewport = SKINOFFSETTOPTR(skin_buffer, viewport->data); | 404 | struct skin_viewport *skin_viewport = SKINOFFSETTOPTR(skin_buffer, viewport->data); |
423 | |||
424 | char *vplabel = SKINOFFSETTOPTR(skin_buffer, skin_viewport->label); | 405 | char *vplabel = SKINOFFSETTOPTR(skin_buffer, skin_viewport->label); |
425 | if (skin_viewport->label == VP_DEFAULT_LABEL) | 406 | if (skin_viewport->label == VP_DEFAULT_LABEL) |
426 | vplabel = VP_DEFAULT_LABEL_STRING; | 407 | vplabel = VP_DEFAULT_LABEL_STRING; |
@@ -460,7 +441,6 @@ static void do_tags_in_hidden_conditional(struct skin_element* branch, | |||
460 | } | 441 | } |
461 | } | 442 | } |
462 | } | 443 | } |
463 | #endif | ||
464 | #ifdef HAVE_ALBUMART | 444 | #ifdef HAVE_ALBUMART |
465 | else if (data->albumart && token->type == SKIN_TOKEN_ALBUMART_DISPLAY) | 445 | else if (data->albumart && token->type == SKIN_TOKEN_ALBUMART_DISPLAY) |
466 | { | 446 | { |
@@ -734,11 +714,10 @@ void skin_render_viewport(struct skin_element* viewport, struct gui_wps *gwps, | |||
734 | .offset = 0, | 714 | .offset = 0, |
735 | .line_desc = LINE_DESC_DEFINIT, | 715 | .line_desc = LINE_DESC_DEFINIT, |
736 | }; | 716 | }; |
737 | 717 | ||
738 | struct align_pos * align = &info.align; | 718 | struct align_pos * align = &info.align; |
739 | bool needs_update, update_all = false; | 719 | bool needs_update, update_all = false; |
740 | skin_buffer = get_skin_buffer(gwps->data); | 720 | skin_buffer = get_skin_buffer(gwps->data); |
741 | #ifdef HAVE_LCD_BITMAP | ||
742 | /* Set images to not to be displayed */ | 721 | /* Set images to not to be displayed */ |
743 | struct skin_token_list *imglist = SKINOFFSETTOPTR(skin_buffer, gwps->data->images); | 722 | struct skin_token_list *imglist = SKINOFFSETTOPTR(skin_buffer, gwps->data->images); |
744 | while (imglist) | 723 | while (imglist) |
@@ -752,10 +731,7 @@ void skin_render_viewport(struct skin_element* viewport, struct gui_wps *gwps, | |||
752 | /* fix font ID's */ | 731 | /* fix font ID's */ |
753 | if (skin_viewport->parsed_fontid == 1) | 732 | if (skin_viewport->parsed_fontid == 1) |
754 | skin_viewport->vp.font = display->getuifont(); | 733 | skin_viewport->vp.font = display->getuifont(); |
755 | #endif | ||
756 | |||
757 | 734 | ||
758 | |||
759 | while (line) | 735 | while (line) |
760 | { | 736 | { |
761 | linebuf[0] = '\0'; | 737 | linebuf[0] = '\0'; |
@@ -811,9 +787,7 @@ void skin_render_viewport(struct skin_element* viewport, struct gui_wps *gwps, | |||
811 | info.line_number++; | 787 | info.line_number++; |
812 | line = SKINOFFSETTOPTR(skin_buffer, line->next); | 788 | line = SKINOFFSETTOPTR(skin_buffer, line->next); |
813 | } | 789 | } |
814 | #ifdef HAVE_LCD_BITMAP | ||
815 | wps_display_images(gwps, &skin_viewport->vp); | 790 | wps_display_images(gwps, &skin_viewport->vp); |
816 | #endif | ||
817 | } | 791 | } |
818 | 792 | ||
819 | void skin_render(struct gui_wps *gwps, unsigned refresh_mode) | 793 | void skin_render(struct gui_wps *gwps, unsigned refresh_mode) |
@@ -903,8 +877,7 @@ void skin_render(struct gui_wps *gwps, unsigned refresh_mode) | |||
903 | display->update(); | 877 | display->update(); |
904 | } | 878 | } |
905 | 879 | ||
906 | #ifdef HAVE_LCD_BITMAP | 880 | static __attribute__((noinline)) |
907 | static __attribute__((noinline)) | ||
908 | void skin_render_playlistviewer(struct playlistviewer* viewer, | 881 | void skin_render_playlistviewer(struct playlistviewer* viewer, |
909 | struct gui_wps *gwps, | 882 | struct gui_wps *gwps, |
910 | struct skin_viewport* skin_viewport, | 883 | struct skin_viewport* skin_viewport, |
@@ -926,7 +899,7 @@ void skin_render_playlistviewer(struct playlistviewer* viewer, | |||
926 | .offset = viewer->start_offset, | 899 | .offset = viewer->start_offset, |
927 | .line_desc = LINE_DESC_DEFINIT, | 900 | .line_desc = LINE_DESC_DEFINIT, |
928 | }; | 901 | }; |
929 | 902 | ||
930 | struct align_pos * align = &info.align; | 903 | struct align_pos * align = &info.align; |
931 | bool needs_update; | 904 | bool needs_update; |
932 | int cur_pos, start_item, max; | 905 | int cur_pos, start_item, max; |
@@ -989,4 +962,3 @@ void skin_render_playlistviewer(struct playlistviewer* viewer, | |||
989 | start_item++; | 962 | start_item++; |
990 | } | 963 | } |
991 | } | 964 | } |
992 | #endif | ||
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c index 2528a0af55..db9a9e694b 100644 --- a/apps/gui/skin_engine/skin_tokens.c +++ b/apps/gui/skin_engine/skin_tokens.c | |||
@@ -41,11 +41,9 @@ | |||
41 | #include "lang.h" | 41 | #include "lang.h" |
42 | #include "misc.h" | 42 | #include "misc.h" |
43 | #include "led.h" | 43 | #include "led.h" |
44 | #ifdef HAVE_LCD_BITMAP | ||
45 | #include "peakmeter.h" | 44 | #include "peakmeter.h" |
46 | /* Image stuff */ | 45 | /* Image stuff */ |
47 | #include "albumart.h" | 46 | #include "albumart.h" |
48 | #endif | ||
49 | #include "playlist.h" | 47 | #include "playlist.h" |
50 | #include "playback.h" | 48 | #include "playback.h" |
51 | #include "tdspeed.h" | 49 | #include "tdspeed.h" |
@@ -813,7 +811,6 @@ const char *get_token_value(struct gui_wps *gwps, | |||
813 | if (intval) | 811 | if (intval) |
814 | *intval = playlist_amount(); | 812 | *intval = playlist_amount(); |
815 | return buf; | 813 | return buf; |
816 | #ifdef HAVE_LCD_BITMAP | ||
817 | case SKIN_TOKEN_LIST_TITLE_TEXT: | 814 | case SKIN_TOKEN_LIST_TITLE_TEXT: |
818 | return sb_get_title(gwps->display->screen_type); | 815 | return sb_get_title(gwps->display->screen_type); |
819 | case SKIN_TOKEN_LIST_TITLE_ICON: | 816 | case SKIN_TOKEN_LIST_TITLE_ICON: |
@@ -854,7 +851,6 @@ const char *get_token_value(struct gui_wps *gwps, | |||
854 | } | 851 | } |
855 | case SKIN_TOKEN_LIST_NEEDS_SCROLLBAR: | 852 | case SKIN_TOKEN_LIST_NEEDS_SCROLLBAR: |
856 | return skinlist_needs_scrollbar(gwps->display->screen_type) ? "s" : ""; | 853 | return skinlist_needs_scrollbar(gwps->display->screen_type) ? "s" : ""; |
857 | #endif | ||
858 | case SKIN_TOKEN_PLAYLIST_NAME: | 854 | case SKIN_TOKEN_PLAYLIST_NAME: |
859 | return playlist_name(NULL, buf, buf_size); | 855 | return playlist_name(NULL, buf, buf_size); |
860 | 856 | ||
@@ -1202,7 +1198,6 @@ const char *get_token_value(struct gui_wps *gwps, | |||
1202 | return "-"; | 1198 | return "-"; |
1203 | #endif | 1199 | #endif |
1204 | 1200 | ||
1205 | #ifdef HAVE_LCD_BITMAP | ||
1206 | /* peakmeter */ | 1201 | /* peakmeter */ |
1207 | case SKIN_TOKEN_PEAKMETER_LEFT: | 1202 | case SKIN_TOKEN_PEAKMETER_LEFT: |
1208 | case SKIN_TOKEN_PEAKMETER_RIGHT: | 1203 | case SKIN_TOKEN_PEAKMETER_RIGHT: |
@@ -1218,7 +1213,6 @@ const char *get_token_value(struct gui_wps *gwps, | |||
1218 | data->peak_meter_enabled = true; | 1213 | data->peak_meter_enabled = true; |
1219 | return buf; | 1214 | return buf; |
1220 | } | 1215 | } |
1221 | #endif | ||
1222 | 1216 | ||
1223 | case SKIN_TOKEN_CROSSFADE: | 1217 | case SKIN_TOKEN_CROSSFADE: |
1224 | #ifdef HAVE_CROSSFADE | 1218 | #ifdef HAVE_CROSSFADE |
diff --git a/apps/gui/skin_engine/wps_internals.h b/apps/gui/skin_engine/wps_internals.h index caf43b21cb..b7d7ff35d0 100644 --- a/apps/gui/skin_engine/wps_internals.h +++ b/apps/gui/skin_engine/wps_internals.h | |||
@@ -80,7 +80,6 @@ struct skin_token_list { | |||
80 | OFFSETTYPE(struct skin_token_list *) next; | 80 | OFFSETTYPE(struct skin_token_list *) next; |
81 | }; | 81 | }; |
82 | 82 | ||
83 | #ifdef HAVE_LCD_BITMAP | ||
84 | struct gui_img { | 83 | struct gui_img { |
85 | OFFSETTYPE(struct viewport*) vp; /* The viewport to display this image in */ | 84 | OFFSETTYPE(struct viewport*) vp; /* The viewport to display this image in */ |
86 | short int x; /* x-pos */ | 85 | short int x; /* x-pos */ |
@@ -137,9 +136,6 @@ struct draw_rectangle { | |||
137 | unsigned start_colour; | 136 | unsigned start_colour; |
138 | unsigned end_colour; | 137 | unsigned end_colour; |
139 | }; | 138 | }; |
140 | #endif | ||
141 | |||
142 | |||
143 | 139 | ||
144 | struct align_pos { | 140 | struct align_pos { |
145 | char* left; | 141 | char* left; |
@@ -147,11 +143,7 @@ struct align_pos { | |||
147 | char* right; | 143 | char* right; |
148 | }; | 144 | }; |
149 | 145 | ||
150 | #ifdef HAVE_LCD_BITMAP | ||
151 | #define WPS_MAX_TOKENS 1150 | 146 | #define WPS_MAX_TOKENS 1150 |
152 | #else | ||
153 | #define WPS_MAX_TOKENS 64 | ||
154 | #endif | ||
155 | 147 | ||
156 | enum wps_parse_error { | 148 | enum wps_parse_error { |
157 | PARSE_OK, | 149 | PARSE_OK, |
@@ -344,11 +336,9 @@ struct wps_data | |||
344 | int buflib_handle; | 336 | int buflib_handle; |
345 | 337 | ||
346 | OFFSETTYPE(struct skin_element *) tree; | 338 | OFFSETTYPE(struct skin_element *) tree; |
347 | #ifdef HAVE_LCD_BITMAP | ||
348 | OFFSETTYPE(struct skin_token_list *) images; | 339 | OFFSETTYPE(struct skin_token_list *) images; |
349 | OFFSETTYPE(int *) font_ids; | 340 | OFFSETTYPE(int *) font_ids; |
350 | int font_count; | 341 | int font_count; |
351 | #endif | ||
352 | #ifdef HAVE_BACKDROP_IMAGE | 342 | #ifdef HAVE_BACKDROP_IMAGE |
353 | int backdrop_id; | 343 | int backdrop_id; |
354 | bool use_extra_framebuffer; | 344 | bool use_extra_framebuffer; |
@@ -370,11 +360,9 @@ struct wps_data | |||
370 | OFFSETTYPE(struct skin_token_list *) skinvars; | 360 | OFFSETTYPE(struct skin_token_list *) skinvars; |
371 | #endif | 361 | #endif |
372 | 362 | ||
373 | #ifdef HAVE_LCD_BITMAP | ||
374 | bool peak_meter_enabled; | 363 | bool peak_meter_enabled; |
375 | bool wps_sb_tag; | 364 | bool wps_sb_tag; |
376 | bool show_sb_on_wps; | 365 | bool show_sb_on_wps; |
377 | #endif | ||
378 | bool wps_loaded; | 366 | bool wps_loaded; |
379 | }; | 367 | }; |
380 | 368 | ||
@@ -448,9 +436,7 @@ const char *get_radio_token(struct wps_token *token, int preset_offset, | |||
448 | enum skin_find_what { | 436 | enum skin_find_what { |
449 | SKIN_FIND_VP = 0, | 437 | SKIN_FIND_VP = 0, |
450 | SKIN_FIND_UIVP, | 438 | SKIN_FIND_UIVP, |
451 | #ifdef HAVE_LCD_BITMAP | ||
452 | SKIN_FIND_IMAGE, | 439 | SKIN_FIND_IMAGE, |
453 | #endif | ||
454 | #ifdef HAVE_TOUCHSCREEN | 440 | #ifdef HAVE_TOUCHSCREEN |
455 | SKIN_FIND_TOUCHREGION, | 441 | SKIN_FIND_TOUCHREGION, |
456 | #endif | 442 | #endif |
diff --git a/apps/gui/splash.c b/apps/gui/splash.c index fa2c21768a..5bcac80169 100644 --- a/apps/gui/splash.c +++ b/apps/gui/splash.c | |||
@@ -31,16 +31,11 @@ | |||
31 | #include "viewport.h" | 31 | #include "viewport.h" |
32 | #include "strtok_r.h" | 32 | #include "strtok_r.h" |
33 | 33 | ||
34 | #ifdef HAVE_LCD_BITMAP | ||
35 | |||
36 | #define MAXLINES (LCD_HEIGHT/6) | 34 | #define MAXLINES (LCD_HEIGHT/6) |
37 | #define MAXBUFFER 512 | 35 | #define MAXBUFFER 512 |
38 | #define RECT_SPACING 2 | 36 | #define RECT_SPACING 2 |
39 | #define SPLASH_MEMORY_INTERVAL (HZ) | 37 | #define SPLASH_MEMORY_INTERVAL (HZ) |
40 | 38 | ||
41 | #endif | ||
42 | |||
43 | |||
44 | static void splash_internal(struct screen * screen, const char *fmt, va_list ap) | 39 | static void splash_internal(struct screen * screen, const char *fmt, va_list ap) |
45 | { | 40 | { |
46 | char splash_buf[MAXBUFFER]; | 41 | char splash_buf[MAXBUFFER]; |
@@ -54,15 +49,13 @@ static void splash_internal(struct screen * screen, const char *fmt, va_list ap) | |||
54 | int y, i; | 49 | int y, i; |
55 | int space_w, w, h; | 50 | int space_w, w, h; |
56 | struct viewport vp; | 51 | struct viewport vp; |
57 | #ifdef HAVE_LCD_BITMAP | ||
58 | int width, height; | 52 | int width, height; |
59 | int maxw = 0; | 53 | int maxw = 0; |
60 | 54 | ||
61 | viewport_set_defaults(&vp, screen->screen_type); | 55 | viewport_set_defaults(&vp, screen->screen_type); |
62 | screen->set_viewport(&vp); | 56 | screen->set_viewport(&vp); |
63 | 57 | ||
64 | screen->getstringsize(" ", &space_w, &h); | 58 | screen->getstringsize(" ", &space_w, &h); |
65 | #endif | ||
66 | y = h; | 59 | y = h; |
67 | 60 | ||
68 | vsnprintf(splash_buf, sizeof(splash_buf), fmt, ap); | 61 | vsnprintf(splash_buf, sizeof(splash_buf), fmt, ap); |
@@ -77,20 +70,14 @@ static void splash_internal(struct screen * screen, const char *fmt, va_list ap) | |||
77 | lines[0] = next; | 70 | lines[0] = next; |
78 | while (true) | 71 | while (true) |
79 | { | 72 | { |
80 | #ifdef HAVE_LCD_BITMAP | ||
81 | screen->getstringsize(next, &w, NULL); | 73 | screen->getstringsize(next, &w, NULL); |
82 | #else | ||
83 | w = utf8length(next); | ||
84 | #endif | ||
85 | if (lastbreak) | 74 | if (lastbreak) |
86 | { | 75 | { |
87 | if (x + (next - lastbreak) * space_w + w | 76 | if (x + (next - lastbreak) * space_w + w |
88 | > vp.width - RECT_SPACING*2) | 77 | > vp.width - RECT_SPACING*2) |
89 | { /* too wide, wrap */ | 78 | { /* too wide, wrap */ |
90 | #ifdef HAVE_LCD_BITMAP | ||
91 | if (x > maxw) | 79 | if (x > maxw) |
92 | maxw = x; | 80 | maxw = x; |
93 | #endif | ||
94 | if ((y + h > vp.height) || (line >= (MAXLINES-1))) | 81 | if ((y + h > vp.height) || (line >= (MAXLINES-1))) |
95 | break; /* screen full or out of lines */ | 82 | break; /* screen full or out of lines */ |
96 | x = 0; | 83 | x = 0; |
@@ -109,10 +96,8 @@ static void splash_internal(struct screen * screen, const char *fmt, va_list ap) | |||
109 | next = strtok_r(NULL, " ", &store); | 96 | next = strtok_r(NULL, " ", &store); |
110 | if (!next) | 97 | if (!next) |
111 | { /* no more words */ | 98 | { /* no more words */ |
112 | #ifdef HAVE_LCD_BITMAP | ||
113 | if (x > maxw) | 99 | if (x > maxw) |
114 | maxw = x; | 100 | maxw = x; |
115 | #endif | ||
116 | break; | 101 | break; |
117 | } | 102 | } |
118 | } | 103 | } |
@@ -123,8 +108,6 @@ static void splash_internal(struct screen * screen, const char *fmt, va_list ap) | |||
123 | 108 | ||
124 | screen->scroll_stop(); | 109 | screen->scroll_stop(); |
125 | 110 | ||
126 | #ifdef HAVE_LCD_BITMAP | ||
127 | |||
128 | width = maxw + 2*RECT_SPACING; | 111 | width = maxw + 2*RECT_SPACING; |
129 | height = y + 2*RECT_SPACING; | 112 | height = y + 2*RECT_SPACING; |
130 | 113 | ||
@@ -166,14 +149,11 @@ static void splash_internal(struct screen * screen, const char *fmt, va_list ap) | |||
166 | 149 | ||
167 | /* prepare putting the text */ | 150 | /* prepare putting the text */ |
168 | y = RECT_SPACING; | 151 | y = RECT_SPACING; |
169 | #endif | ||
170 | 152 | ||
171 | /* print the message to screen */ | 153 | /* print the message to screen */ |
172 | for (i = 0; i <= line; i++, y+=h) | 154 | for (i = 0; i <= line; i++, y+=h) |
173 | { | 155 | { |
174 | #ifdef HAVE_LCD_BITMAP | ||
175 | screen->putsxy(0, y, lines[i]); | 156 | screen->putsxy(0, y, lines[i]); |
176 | #endif | ||
177 | } | 157 | } |
178 | screen->update_viewport(); | 158 | screen->update_viewport(); |
179 | end: | 159 | end: |
diff --git a/apps/gui/statusbar-skinned.h b/apps/gui/statusbar-skinned.h index 237ec45c82..ad102bef47 100644 --- a/apps/gui/statusbar-skinned.h +++ b/apps/gui/statusbar-skinned.h | |||
@@ -23,8 +23,6 @@ | |||
23 | 23 | ||
24 | #define DEFAULT_UPDATE_DELAY (HZ/7) | 24 | #define DEFAULT_UPDATE_DELAY (HZ/7) |
25 | 25 | ||
26 | #ifdef HAVE_LCD_BITMAP | ||
27 | |||
28 | #include <stdio.h> | 26 | #include <stdio.h> |
29 | #include <string.h> | 27 | #include <string.h> |
30 | #include <stdlib.h> | 28 | #include <stdlib.h> |
@@ -57,14 +55,5 @@ int sb_get_backdrop(enum screen_type screen); | |||
57 | int sb_preproccess(enum screen_type screen, struct wps_data *data); | 55 | int sb_preproccess(enum screen_type screen, struct wps_data *data); |
58 | int sb_postproccess(enum screen_type screen, struct wps_data *data); | 56 | int sb_postproccess(enum screen_type screen, struct wps_data *data); |
59 | 57 | ||
60 | #else /* CHARCELL */ | ||
61 | #define sb_skin_init() | ||
62 | #define sb_skin_data_load(a,b,c) | ||
63 | #define sb_skin_set_update_delay(a) | ||
64 | #define sb_skin_set_state(a,b) | ||
65 | #define sb_create_from_settings NULL | ||
66 | #define sb_preproccess NULL | ||
67 | #define sb_postproccess NULL | ||
68 | #endif | ||
69 | void do_sbs_update_callback(unsigned short id, void *param); | 58 | void do_sbs_update_callback(unsigned short id, void *param); |
70 | #endif /* __STATUSBAR_SKINNED_H__ */ | 59 | #endif /* __STATUSBAR_SKINNED_H__ */ |
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c index 0c8f54f749..a43828b268 100644 --- a/apps/gui/statusbar.c +++ b/apps/gui/statusbar.c | |||
@@ -132,7 +132,6 @@ | |||
132 | struct gui_syncstatusbar statusbars; | 132 | struct gui_syncstatusbar statusbars; |
133 | 133 | ||
134 | /* Prototypes */ | 134 | /* Prototypes */ |
135 | #ifdef HAVE_LCD_BITMAP | ||
136 | static void gui_statusbar_icon_battery(struct screen * display, int percent, | 135 | static void gui_statusbar_icon_battery(struct screen * display, int percent, |
137 | int batt_charge_step); | 136 | int batt_charge_step); |
138 | static bool gui_statusbar_icon_volume(struct gui_statusbar * bar, int volume); | 137 | static bool gui_statusbar_icon_volume(struct gui_statusbar * bar, int volume); |
@@ -152,7 +151,6 @@ static void gui_statusbar_icon_recording_info(struct screen * display); | |||
152 | #if CONFIG_RTC | 151 | #if CONFIG_RTC |
153 | static void gui_statusbar_time(struct screen * display, struct tm *time); | 152 | static void gui_statusbar_time(struct screen * display, struct tm *time); |
154 | #endif | 153 | #endif |
155 | #endif | ||
156 | 154 | ||
157 | /* End prototypes */ | 155 | /* End prototypes */ |
158 | 156 | ||
@@ -242,7 +240,6 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw, struct vi | |||
242 | } | 240 | } |
243 | 241 | ||
244 | bar->info.volume = global_settings.volume; | 242 | bar->info.volume = global_settings.volume; |
245 | #ifdef HAVE_LCD_BITMAP | ||
246 | bar->info.shuffle = global_settings.playlist_shuffle; | 243 | bar->info.shuffle = global_settings.playlist_shuffle; |
247 | #ifdef HAS_BUTTON_HOLD | 244 | #ifdef HAS_BUTTON_HOLD |
248 | bar->info.keylock = button_hold(); | 245 | bar->info.keylock = button_hold(); |
@@ -349,11 +346,8 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw, struct vi | |||
349 | display->set_viewport(NULL); | 346 | display->set_viewport(NULL); |
350 | bar->lastinfo = bar->info; | 347 | bar->lastinfo = bar->info; |
351 | } | 348 | } |
352 | #endif /* HAVE_LCD_BITMAP */ | ||
353 | |||
354 | } | 349 | } |
355 | 350 | ||
356 | #ifdef HAVE_LCD_BITMAP | ||
357 | /* from icon.c */ | 351 | /* from icon.c */ |
358 | /* | 352 | /* |
359 | * Print battery icon to status bar | 353 | * Print battery icon to status bar |
@@ -717,8 +711,6 @@ static void gui_statusbar_icon_recording_info(struct screen * display) | |||
717 | } | 711 | } |
718 | #endif /* HAVE_RECORDING */ | 712 | #endif /* HAVE_RECORDING */ |
719 | 713 | ||
720 | #endif /* HAVE_LCD_BITMAP */ | ||
721 | |||
722 | void gui_syncstatusbar_init(struct gui_syncstatusbar * bars) | 714 | void gui_syncstatusbar_init(struct gui_syncstatusbar * bars) |
723 | { | 715 | { |
724 | FOR_NB_SCREENS(i) { | 716 | FOR_NB_SCREENS(i) { |
@@ -730,7 +722,6 @@ void gui_syncstatusbar_init(struct gui_syncstatusbar * bars) | |||
730 | void gui_syncstatusbar_draw(struct gui_syncstatusbar * bars, | 722 | void gui_syncstatusbar_draw(struct gui_syncstatusbar * bars, |
731 | bool force_redraw) | 723 | bool force_redraw) |
732 | { | 724 | { |
733 | #ifdef HAVE_LCD_BITMAP | ||
734 | if(!global_settings.statusbar) | 725 | if(!global_settings.statusbar) |
735 | return; | 726 | return; |
736 | struct viewport viewport; | 727 | struct viewport viewport; |
@@ -738,9 +729,6 @@ void gui_syncstatusbar_draw(struct gui_syncstatusbar * bars, | |||
738 | GET_RECT(viewport,statusbar_position(i),&screens[i]); | 729 | GET_RECT(viewport,statusbar_position(i),&screens[i]); |
739 | gui_statusbar_draw( &(bars->statusbars[i]), force_redraw, &viewport ); | 730 | gui_statusbar_draw( &(bars->statusbars[i]), force_redraw, &viewport ); |
740 | } | 731 | } |
741 | #else | ||
742 | gui_statusbar_draw( &(bars->statusbars[0]), force_redraw, NULL ); | ||
743 | #endif /* HAVE_LCD_BITMAP */ | ||
744 | } | 732 | } |
745 | 733 | ||
746 | 734 | ||
diff --git a/apps/gui/usb_screen.c b/apps/gui/usb_screen.c index dd1d97df3c..3169831322 100644 --- a/apps/gui/usb_screen.c +++ b/apps/gui/usb_screen.c | |||
@@ -42,9 +42,7 @@ | |||
42 | #include "playlist.h" | 42 | #include "playlist.h" |
43 | #include "misc.h" | 43 | #include "misc.h" |
44 | 44 | ||
45 | #ifdef HAVE_LCD_BITMAP | ||
46 | #include "bitmaps/usblogo.h" | 45 | #include "bitmaps/usblogo.h" |
47 | #endif | ||
48 | 46 | ||
49 | #ifdef HAVE_REMOTE_LCD | 47 | #ifdef HAVE_REMOTE_LCD |
50 | #include "bitmaps/remote_usblogo.h" | 48 | #include "bitmaps/remote_usblogo.h" |
@@ -122,15 +120,12 @@ static int handle_usb_events(void) | |||
122 | struct usb_screen_vps_t | 120 | struct usb_screen_vps_t |
123 | { | 121 | { |
124 | struct viewport parent; | 122 | struct viewport parent; |
125 | #ifdef HAVE_LCD_BITMAP | ||
126 | struct viewport logo; | 123 | struct viewport logo; |
127 | #ifdef USB_ENABLE_HID | 124 | #ifdef USB_ENABLE_HID |
128 | struct viewport title; | 125 | struct viewport title; |
129 | #endif | 126 | #endif |
130 | #endif | ||
131 | }; | 127 | }; |
132 | 128 | ||
133 | #ifdef HAVE_LCD_BITMAP | ||
134 | static void usb_screen_fix_viewports(struct screen *screen, | 129 | static void usb_screen_fix_viewports(struct screen *screen, |
135 | struct usb_screen_vps_t *usb_screen_vps) | 130 | struct usb_screen_vps_t *usb_screen_vps) |
136 | { | 131 | { |
@@ -181,18 +176,15 @@ static void usb_screen_fix_viewports(struct screen *screen, | |||
181 | } | 176 | } |
182 | #endif | 177 | #endif |
183 | } | 178 | } |
184 | #endif | ||
185 | 179 | ||
186 | static void usb_screens_draw(struct usb_screen_vps_t *usb_screen_vps_ar) | 180 | static void usb_screens_draw(struct usb_screen_vps_t *usb_screen_vps_ar) |
187 | { | 181 | { |
188 | #ifdef HAVE_LCD_BITMAP | ||
189 | static const struct bitmap* logos[NB_SCREENS] = { | 182 | static const struct bitmap* logos[NB_SCREENS] = { |
190 | &bm_usblogo, | 183 | &bm_usblogo, |
191 | #ifdef HAVE_REMOTE_LCD | 184 | #ifdef HAVE_REMOTE_LCD |
192 | &bm_remote_usblogo, | 185 | &bm_remote_usblogo, |
193 | #endif | 186 | #endif |
194 | }; | 187 | }; |
195 | #endif | ||
196 | 188 | ||
197 | FOR_NB_SCREENS(i) | 189 | FOR_NB_SCREENS(i) |
198 | { | 190 | { |
@@ -200,15 +192,12 @@ static void usb_screens_draw(struct usb_screen_vps_t *usb_screen_vps_ar) | |||
200 | 192 | ||
201 | struct usb_screen_vps_t *usb_screen_vps = &usb_screen_vps_ar[i]; | 193 | struct usb_screen_vps_t *usb_screen_vps = &usb_screen_vps_ar[i]; |
202 | struct viewport *parent = &usb_screen_vps->parent; | 194 | struct viewport *parent = &usb_screen_vps->parent; |
203 | #ifdef HAVE_LCD_BITMAP | ||
204 | struct viewport *logo = &usb_screen_vps->logo; | 195 | struct viewport *logo = &usb_screen_vps->logo; |
205 | #endif | ||
206 | 196 | ||
207 | screen->set_viewport(parent); | 197 | screen->set_viewport(parent); |
208 | screen->clear_viewport(); | 198 | screen->clear_viewport(); |
209 | screen->backlight_on(); | 199 | screen->backlight_on(); |
210 | 200 | ||
211 | #ifdef HAVE_LCD_BITMAP | ||
212 | screen->set_viewport(logo); | 201 | screen->set_viewport(logo); |
213 | screen->bmp(logos[i], 0, 0); | 202 | screen->bmp(logos[i], 0, 0); |
214 | if (i == SCREEN_MAIN) | 203 | if (i == SCREEN_MAIN) |
@@ -228,14 +217,6 @@ static void usb_screens_draw(struct usb_screen_vps_t *usb_screen_vps_ar) | |||
228 | } | 217 | } |
229 | screen->set_viewport(parent); | 218 | screen->set_viewport(parent); |
230 | 219 | ||
231 | #else /* !HAVE_LCD_BITMAP */ | ||
232 | screen->double_height(false); | ||
233 | screen->puts_scroll(0, 0, "[USB Mode]"); | ||
234 | status_set_param(false); | ||
235 | status_set_audio(false); | ||
236 | status_set_usb(true); | ||
237 | #endif /* HAVE_LCD_BITMAP */ | ||
238 | |||
239 | screen->set_viewport(NULL); | 220 | screen->set_viewport(NULL); |
240 | screen->update_viewport(); | 221 | screen->update_viewport(); |
241 | } | 222 | } |
@@ -275,13 +256,11 @@ void gui_usb_screen_run(bool early_usb) | |||
275 | /* update the UI before disabling fonts, this maximizes the propability | 256 | /* update the UI before disabling fonts, this maximizes the propability |
276 | * that font cache lookups succeed during USB */ | 257 | * that font cache lookups succeed during USB */ |
277 | send_event(GUI_EVENT_ACTIONUPDATE, NULL); | 258 | send_event(GUI_EVENT_ACTIONUPDATE, NULL); |
278 | #ifdef HAVE_LCD_BITMAP | ||
279 | if(!early_usb) | 259 | if(!early_usb) |
280 | { | 260 | { |
281 | /* The font system leaves the .fnt fd's open, so we need for force close them all */ | 261 | /* The font system leaves the .fnt fd's open, so we need for force close them all */ |
282 | font_disable_all(); | 262 | font_disable_all(); |
283 | } | 263 | } |
284 | #endif | ||
285 | 264 | ||
286 | usb_acknowledge(SYS_USB_CONNECTED_ACK); | 265 | usb_acknowledge(SYS_USB_CONNECTED_ACK); |
287 | 266 | ||
@@ -302,10 +281,8 @@ void gui_usb_screen_run(bool early_usb) | |||
302 | { | 281 | { |
303 | const struct viewport* vp = NULL; | 282 | const struct viewport* vp = NULL; |
304 | 283 | ||
305 | #if defined(HAVE_LCD_BITMAP) && defined(USB_ENABLE_HID) | 284 | #if defined(USB_ENABLE_HID) |
306 | vp = usb_hid ? &usb_screen_vps_ar[i].title : NULL; | 285 | vp = usb_hid ? &usb_screen_vps_ar[i].title : NULL; |
307 | #elif !defined(HAVE_LCD_BITMAP) | ||
308 | vp = &usb_screen_vps_ar[i].parent; | ||
309 | #endif | 286 | #endif |
310 | if (vp) | 287 | if (vp) |
311 | screens[i].scroll_stop_viewport(vp); | 288 | screens[i].scroll_stop_viewport(vp); |
@@ -322,7 +299,6 @@ void gui_usb_screen_run(bool early_usb) | |||
322 | touchscreen_set_mode(old_mode); | 299 | touchscreen_set_mode(old_mode); |
323 | #endif | 300 | #endif |
324 | 301 | ||
325 | #ifdef HAVE_LCD_BITMAP | ||
326 | if(!early_usb) | 302 | if(!early_usb) |
327 | { | 303 | { |
328 | font_enable_all(); | 304 | font_enable_all(); |
@@ -331,7 +307,6 @@ void gui_usb_screen_run(bool early_usb) | |||
331 | /* Reload playlist */ | 307 | /* Reload playlist */ |
332 | playlist_resume(); | 308 | playlist_resume(); |
333 | } | 309 | } |
334 | #endif | ||
335 | 310 | ||
336 | FOR_NB_SCREENS(i) | 311 | FOR_NB_SCREENS(i) |
337 | { | 312 | { |
diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c index fad3255cdb..db58b5d72d 100644 --- a/apps/gui/viewport.c +++ b/apps/gui/viewport.c | |||
@@ -54,9 +54,7 @@ | |||
54 | #include "statusbar.h" | 54 | #include "statusbar.h" |
55 | #include "appevents.h" | 55 | #include "appevents.h" |
56 | #include "panic.h" | 56 | #include "panic.h" |
57 | #ifdef HAVE_LCD_BITMAP | ||
58 | #include "language.h" | 57 | #include "language.h" |
59 | #endif | ||
60 | #include "statusbar-skinned.h" | 58 | #include "statusbar-skinned.h" |
61 | #include "skin_engine/skin_engine.h" | 59 | #include "skin_engine/skin_engine.h" |
62 | #include "debug.h" | 60 | #include "debug.h" |
@@ -68,7 +66,6 @@ struct viewport_stack_item | |||
68 | bool enabled; | 66 | bool enabled; |
69 | }; | 67 | }; |
70 | 68 | ||
71 | #ifdef HAVE_LCD_BITMAP | ||
72 | static void viewportmanager_redraw(unsigned short id, void* data); | 69 | static void viewportmanager_redraw(unsigned short id, void* data); |
73 | 70 | ||
74 | static int theme_stack_top[NB_SCREENS]; /* the last item added */ | 71 | static int theme_stack_top[NB_SCREENS]; /* the last item added */ |
@@ -218,16 +215,10 @@ static bool is_theme_enabled(enum screen_type screen) | |||
218 | int top = theme_stack_top[screen]; | 215 | int top = theme_stack_top[screen]; |
219 | return theme_stack[screen][top].enabled; | 216 | return theme_stack[screen][top].enabled; |
220 | } | 217 | } |
221 | #endif /* HAVE_LCD_BITMAP */ | ||
222 | 218 | ||
223 | int viewport_get_nb_lines(const struct viewport *vp) | 219 | int viewport_get_nb_lines(const struct viewport *vp) |
224 | { | 220 | { |
225 | #ifdef HAVE_LCD_BITMAP | ||
226 | return vp->height/font_get(vp->font)->height; | 221 | return vp->height/font_get(vp->font)->height; |
227 | #else | ||
228 | (void)vp; | ||
229 | return 2; | ||
230 | #endif | ||
231 | } | 222 | } |
232 | 223 | ||
233 | static void viewportmanager_redraw(unsigned short id, void* data) | 224 | static void viewportmanager_redraw(unsigned short id, void* data) |
@@ -235,31 +226,21 @@ static void viewportmanager_redraw(unsigned short id, void* data) | |||
235 | (void)id; | 226 | (void)id; |
236 | FOR_NB_SCREENS(i) | 227 | FOR_NB_SCREENS(i) |
237 | { | 228 | { |
238 | #ifdef HAVE_LCD_BITMAP | ||
239 | if (is_theme_enabled(i)) | 229 | if (is_theme_enabled(i)) |
240 | sb_skin_update(i, NULL != data); | 230 | sb_skin_update(i, NULL != data); |
241 | #else | ||
242 | (void)data; | ||
243 | gui_statusbar_draw(&statusbars.statusbars[i], NULL, NULL); | ||
244 | #endif | ||
245 | } | 231 | } |
246 | } | 232 | } |
247 | 233 | ||
248 | void viewportmanager_init() | 234 | void viewportmanager_init() |
249 | { | 235 | { |
250 | #ifdef HAVE_LCD_BITMAP | ||
251 | FOR_NB_SCREENS(i) | 236 | FOR_NB_SCREENS(i) |
252 | { | 237 | { |
253 | theme_stack_top[i] = -1; /* the next call fixes this to 0 */ | 238 | theme_stack_top[i] = -1; /* the next call fixes this to 0 */ |
254 | /* We always want the theme enabled by default... */ | 239 | /* We always want the theme enabled by default... */ |
255 | viewportmanager_theme_enable(i, true, NULL); | 240 | viewportmanager_theme_enable(i, true, NULL); |
256 | } | 241 | } |
257 | #else | ||
258 | add_event(GUI_EVENT_ACTIONUPDATE, viewportmanager_redraw); | ||
259 | #endif | ||
260 | } | 242 | } |
261 | 243 | ||
262 | #ifdef HAVE_LCD_BITMAP | ||
263 | void viewportmanager_theme_changed(const int which) | 244 | void viewportmanager_theme_changed(const int which) |
264 | { | 245 | { |
265 | if (which & THEME_LANGUAGE) | 246 | if (which & THEME_LANGUAGE) |
@@ -296,7 +277,6 @@ static void set_default_align_flags(struct viewport *vp) | |||
296 | vp->flags |= VP_FLAG_ALIGN_RIGHT; | 277 | vp->flags |= VP_FLAG_ALIGN_RIGHT; |
297 | } | 278 | } |
298 | 279 | ||
299 | #endif /* HAVE_LCD_BITMAP */ | ||
300 | #endif /* __PCTOOL__ */ | 280 | #endif /* __PCTOOL__ */ |
301 | 281 | ||
302 | void viewport_set_fullscreen(struct viewport *vp, | 282 | void viewport_set_fullscreen(struct viewport *vp, |
@@ -307,7 +287,6 @@ void viewport_set_fullscreen(struct viewport *vp, | |||
307 | vp->width = screens[screen].lcdwidth; | 287 | vp->width = screens[screen].lcdwidth; |
308 | vp->height = screens[screen].lcdheight; | 288 | vp->height = screens[screen].lcdheight; |
309 | 289 | ||
310 | #ifdef HAVE_LCD_BITMAP | ||
311 | #ifndef __PCTOOL__ | 290 | #ifndef __PCTOOL__ |
312 | set_default_align_flags(vp); | 291 | set_default_align_flags(vp); |
313 | #endif | 292 | #endif |
@@ -331,13 +310,12 @@ void viewport_set_fullscreen(struct viewport *vp, | |||
331 | vp->bg_pattern = LCD_REMOTE_DEFAULT_BG; | 310 | vp->bg_pattern = LCD_REMOTE_DEFAULT_BG; |
332 | } | 311 | } |
333 | #endif | 312 | #endif |
334 | #endif | ||
335 | } | 313 | } |
336 | 314 | ||
337 | void viewport_set_defaults(struct viewport *vp, | 315 | void viewport_set_defaults(struct viewport *vp, |
338 | const enum screen_type screen) | 316 | const enum screen_type screen) |
339 | { | 317 | { |
340 | #if defined(HAVE_LCD_BITMAP) && !defined(__PCTOOL__) | 318 | #if !defined(__PCTOOL__) |
341 | struct viewport *sbs_area = NULL; | 319 | struct viewport *sbs_area = NULL; |
342 | if (!is_theme_enabled(screen)) | 320 | if (!is_theme_enabled(screen)) |
343 | { | 321 | { |
@@ -349,13 +327,11 @@ void viewport_set_defaults(struct viewport *vp, | |||
349 | if (sbs_area) | 327 | if (sbs_area) |
350 | *vp = *sbs_area; | 328 | *vp = *sbs_area; |
351 | else | 329 | else |
352 | #endif /* HAVE_LCD_BITMAP */ | 330 | #endif /* !__PCTOOL__ */ |
353 | viewport_set_fullscreen(vp, screen); | 331 | viewport_set_fullscreen(vp, screen); |
354 | } | 332 | } |
355 | 333 | ||
356 | 334 | ||
357 | #ifdef HAVE_LCD_BITMAP | ||
358 | |||
359 | int get_viewport_default_colour(enum screen_type screen, bool fgcolour) | 335 | int get_viewport_default_colour(enum screen_type screen, bool fgcolour) |
360 | { | 336 | { |
361 | (void)screen; (void)fgcolour; | 337 | (void)screen; (void)fgcolour; |
@@ -392,5 +368,3 @@ int get_viewport_default_colour(enum screen_type screen, bool fgcolour) | |||
392 | return 0; | 368 | return 0; |
393 | #endif /* LCD_DEPTH > 1 || LCD_REMOTE_DEPTH > 1 */ | 369 | #endif /* LCD_DEPTH > 1 || LCD_REMOTE_DEPTH > 1 */ |
394 | } | 370 | } |
395 | |||
396 | #endif | ||
diff --git a/apps/gui/viewport.h b/apps/gui/viewport.h index c4b90aa64c..683c36fe76 100644 --- a/apps/gui/viewport.h +++ b/apps/gui/viewport.h | |||
@@ -53,7 +53,6 @@ int get_viewport_default_colour(enum screen_type screen, bool fgcolour); | |||
53 | */ | 53 | */ |
54 | void viewportmanager_init(void) INIT_ATTR; | 54 | void viewportmanager_init(void) INIT_ATTR; |
55 | 55 | ||
56 | #ifdef HAVE_LCD_BITMAP | ||
57 | void viewportmanager_theme_enable(enum screen_type screen, bool enable, | 56 | void viewportmanager_theme_enable(enum screen_type screen, bool enable, |
58 | struct viewport *viewport); | 57 | struct viewport *viewport); |
59 | /* Force will cause a redraw even if the theme was previously and | 58 | /* Force will cause a redraw even if the theme was previously and |
@@ -69,8 +68,6 @@ bool viewport_point_within_vp(const struct viewport *vp, | |||
69 | const int x, const int y); | 68 | const int x, const int y); |
70 | #endif | 69 | #endif |
71 | 70 | ||
72 | #endif | ||
73 | |||
74 | #endif /* __PCTOOL__ */ | 71 | #endif /* __PCTOOL__ */ |
75 | 72 | ||
76 | #endif /* __VIEWPORT_H__ */ | 73 | #endif /* __VIEWPORT_H__ */ |
diff --git a/apps/gui/wps.c b/apps/gui/wps.c index 82321ff945..8d0453385b 100644 --- a/apps/gui/wps.c +++ b/apps/gui/wps.c | |||
@@ -39,9 +39,7 @@ | |||
39 | #include "storage.h" | 39 | #include "storage.h" |
40 | #include "screens.h" | 40 | #include "screens.h" |
41 | #include "playlist.h" | 41 | #include "playlist.h" |
42 | #ifdef HAVE_LCD_BITMAP | ||
43 | #include "icons.h" | 42 | #include "icons.h" |
44 | #endif | ||
45 | #include "lang.h" | 43 | #include "lang.h" |
46 | #include "bookmark.h" | 44 | #include "bookmark.h" |
47 | #include "misc.h" | 45 | #include "misc.h" |
@@ -87,7 +85,6 @@ static void track_info_callback(unsigned short id, void *param); | |||
87 | char* wps_default_skin(enum screen_type screen) | 85 | char* wps_default_skin(enum screen_type screen) |
88 | { | 86 | { |
89 | static char *skin_buf[NB_SCREENS] = { | 87 | static char *skin_buf[NB_SCREENS] = { |
90 | #ifdef HAVE_LCD_BITMAP | ||
91 | #if LCD_DEPTH > 1 | 88 | #if LCD_DEPTH > 1 |
92 | "%X(d)\n" | 89 | "%X(d)\n" |
93 | #endif | 90 | #endif |
@@ -97,10 +94,6 @@ char* wps_default_skin(enum screen_type screen) | |||
97 | "%al%pc/%pt%ar[%pp:%pe]\n" | 94 | "%al%pc/%pt%ar[%pp:%pe]\n" |
98 | "%fbkBit %?fv<avg|> %?iv<%(id3v%iv%)|%(no id3%)>\n" | 95 | "%fbkBit %?fv<avg|> %?iv<%(id3v%iv%)|%(no id3%)>\n" |
99 | "%pb\n%pm\n", | 96 | "%pb\n%pm\n", |
100 | #else | ||
101 | "%s%pp/%pe: %?it<%it|%fn> - %?ia<%ia|%d(2)> - %?id<%id|%d(1)>\n" | ||
102 | "%pc%?ps<*|/>%pt\n", | ||
103 | #endif | ||
104 | #ifdef HAVE_REMOTE_LCD | 97 | #ifdef HAVE_REMOTE_LCD |
105 | #if LCD_REMOTE_DEPTH > 1 | 98 | #if LCD_REMOTE_DEPTH > 1 |
106 | "%X(d)\n" | 99 | "%X(d)\n" |
diff --git a/apps/gui/yesno.c b/apps/gui/yesno.c index 45638b7076..1a1645047a 100644 --- a/apps/gui/yesno.c +++ b/apps/gui/yesno.c | |||
@@ -112,9 +112,7 @@ static void gui_yesno_draw(struct gui_yesno * yn) | |||
112 | if(line_shift+3 <= vp_lines) | 112 | if(line_shift+3 <= vp_lines) |
113 | line_shift++; | 113 | line_shift++; |
114 | display->puts(0, line_shift, str(LANG_CONFIRM_WITH_BUTTON)); | 114 | display->puts(0, line_shift, str(LANG_CONFIRM_WITH_BUTTON)); |
115 | #ifdef HAVE_LCD_BITMAP | ||
116 | display->puts(0, line_shift+1, str(LANG_CANCEL_WITH_ANY)); | 115 | display->puts(0, line_shift+1, str(LANG_CANCEL_WITH_ANY)); |
117 | #endif | ||
118 | } | 116 | } |
119 | #endif | 117 | #endif |
120 | display->update_viewport(); | 118 | display->update_viewport(); |