diff options
Diffstat (limited to 'apps/gui/skin_engine/skin_display.c')
-rw-r--r-- | apps/gui/skin_engine/skin_display.c | 19 |
1 files changed, 1 insertions, 18 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 | } |