diff options
Diffstat (limited to 'apps/gui/skin_engine')
-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 |
8 files changed, 8 insertions, 139 deletions
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 |