diff options
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/gwps-common.c | 6 | ||||
-rw-r--r-- | apps/gui/gwps.c | 34 | ||||
-rw-r--r-- | apps/gui/gwps.h | 4 |
3 files changed, 18 insertions, 26 deletions
diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c index 76ed7d8e35..a959ba43b0 100644 --- a/apps/gui/gwps-common.c +++ b/apps/gui/gwps-common.c | |||
@@ -61,10 +61,6 @@ static void draw_player_fullbar(struct gui_wps *gwps, | |||
61 | /* 3% of 30min file == 54s step size */ | 61 | /* 3% of 30min file == 54s step size */ |
62 | #define MIN_FF_REWIND_STEP 500 | 62 | #define MIN_FF_REWIND_STEP 500 |
63 | 63 | ||
64 | #ifdef HAVE_LCD_COLOR | ||
65 | extern bool wps_has_backdrop; | ||
66 | #endif | ||
67 | |||
68 | /* Skip leading UTF-8 BOM, if present. */ | 64 | /* Skip leading UTF-8 BOM, if present. */ |
69 | static char* skip_utf8_bom(char* buf) | 65 | static char* skip_utf8_bom(char* buf) |
70 | { | 66 | { |
@@ -179,7 +175,7 @@ bool wps_data_preload_tags(struct wps_data *data, char *buf, | |||
179 | 175 | ||
180 | if ((ret > 0) && (bm.width == LCD_WIDTH) | 176 | if ((ret > 0) && (bm.width == LCD_WIDTH) |
181 | && (bm.height == LCD_HEIGHT)) { | 177 | && (bm.height == LCD_HEIGHT)) { |
182 | wps_has_backdrop=true; | 178 | data->has_backdrop=true; |
183 | return true; | 179 | return true; |
184 | } else { | 180 | } else { |
185 | return false; | 181 | return false; |
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c index 6134cb5068..334fc79bd3 100644 --- a/apps/gui/gwps.c +++ b/apps/gui/gwps.c | |||
@@ -64,11 +64,6 @@ struct wps_state wps_state; | |||
64 | struct gui_wps gui_wps[NB_SCREENS]; | 64 | struct gui_wps gui_wps[NB_SCREENS]; |
65 | static struct wps_data wps_datas[NB_SCREENS]; | 65 | static struct wps_data wps_datas[NB_SCREENS]; |
66 | 66 | ||
67 | #ifdef HAVE_LCD_COLOR | ||
68 | bool wps_has_backdrop; | ||
69 | fb_data* old_backdrop; | ||
70 | #endif | ||
71 | |||
72 | bool keys_locked = false; | 67 | bool keys_locked = false; |
73 | 68 | ||
74 | /* change the path to the current played track */ | 69 | /* change the path to the current played track */ |
@@ -110,8 +105,8 @@ long gui_wps_show(void) | |||
110 | gui_wps_set_margin(&gui_wps[i]); | 105 | gui_wps_set_margin(&gui_wps[i]); |
111 | } | 106 | } |
112 | #ifdef HAVE_LCD_COLOR | 107 | #ifdef HAVE_LCD_COLOR |
113 | old_backdrop = lcd_get_backdrop(); | 108 | gui_wps[SCREEN_MAIN].data->old_backdrop = lcd_get_backdrop(); |
114 | if (wps_has_backdrop) { | 109 | if (gui_wps[SCREEN_MAIN].data->has_backdrop) { |
115 | lcd_set_backdrop(&wps_backdrop[0][0]); | 110 | lcd_set_backdrop(&wps_backdrop[0][0]); |
116 | } | 111 | } |
117 | #endif | 112 | #endif |
@@ -239,11 +234,11 @@ long gui_wps_show(void) | |||
239 | case WPS_RC_CONTEXT: | 234 | case WPS_RC_CONTEXT: |
240 | #endif | 235 | #endif |
241 | #ifdef HAVE_LCD_COLOR | 236 | #ifdef HAVE_LCD_COLOR |
242 | lcd_set_backdrop(old_backdrop); | 237 | lcd_set_backdrop(gui_wps[SCREEN_MAIN].data->old_backdrop); |
243 | #endif | 238 | #endif |
244 | onplay(wps_state.id3->path, TREE_ATTR_MPA, CONTEXT_WPS); | 239 | onplay(wps_state.id3->path, TREE_ATTR_MPA, CONTEXT_WPS); |
245 | #ifdef HAVE_LCD_COLOR | 240 | #ifdef HAVE_LCD_COLOR |
246 | if (wps_has_backdrop) | 241 | if (gui_wps[SCREEN_MAIN].data->has_backdrop) |
247 | lcd_set_backdrop(&wps_backdrop[0][0]); | 242 | lcd_set_backdrop(&wps_backdrop[0][0]); |
248 | #endif | 243 | #endif |
249 | #ifdef HAVE_LCD_BITMAP | 244 | #ifdef HAVE_LCD_BITMAP |
@@ -531,12 +526,12 @@ long gui_wps_show(void) | |||
531 | gui_wps[i].display->stop_scroll(); | 526 | gui_wps[i].display->stop_scroll(); |
532 | 527 | ||
533 | #ifdef HAVE_LCD_COLOR | 528 | #ifdef HAVE_LCD_COLOR |
534 | lcd_set_backdrop(old_backdrop); | 529 | lcd_set_backdrop(gui_wps[SCREEN_MAIN].data->old_backdrop); |
535 | #endif | 530 | #endif |
536 | if (main_menu()) | 531 | if (main_menu()) |
537 | return true; | 532 | return true; |
538 | #ifdef HAVE_LCD_COLOR | 533 | #ifdef HAVE_LCD_COLOR |
539 | if (wps_has_backdrop) | 534 | if (gui_wps[SCREEN_MAIN].data->has_backdrop) |
540 | lcd_set_backdrop(&wps_backdrop[0][0]); | 535 | lcd_set_backdrop(&wps_backdrop[0][0]); |
541 | #endif | 536 | #endif |
542 | #ifdef HAVE_LCD_BITMAP | 537 | #ifdef HAVE_LCD_BITMAP |
@@ -568,12 +563,12 @@ long gui_wps_show(void) | |||
568 | case WPS_RC_QUICK: | 563 | case WPS_RC_QUICK: |
569 | #endif | 564 | #endif |
570 | #ifdef HAVE_LCD_COLOR | 565 | #ifdef HAVE_LCD_COLOR |
571 | lcd_set_backdrop(old_backdrop); | 566 | lcd_set_backdrop(gui_wps[SCREEN_MAIN].data->old_backdrop); |
572 | #endif | 567 | #endif |
573 | if (quick_screen_quick(button)) | 568 | if (quick_screen_quick(button)) |
574 | return SYS_USB_CONNECTED; | 569 | return SYS_USB_CONNECTED; |
575 | #ifdef HAVE_LCD_COLOR | 570 | #ifdef HAVE_LCD_COLOR |
576 | if (wps_has_backdrop) | 571 | if (gui_wps[SCREEN_MAIN].data->has_backdrop) |
577 | lcd_set_backdrop(&wps_backdrop[0][0]); | 572 | lcd_set_backdrop(&wps_backdrop[0][0]); |
578 | #endif | 573 | #endif |
579 | #ifdef HAVE_LCD_BITMAP | 574 | #ifdef HAVE_LCD_BITMAP |
@@ -604,12 +599,12 @@ long gui_wps_show(void) | |||
604 | case BUTTON_ON | BUTTON_OFF: | 599 | case BUTTON_ON | BUTTON_OFF: |
605 | #endif | 600 | #endif |
606 | #ifdef HAVE_LCD_COLOR | 601 | #ifdef HAVE_LCD_COLOR |
607 | lcd_set_backdrop(old_backdrop); | 602 | lcd_set_backdrop(gui_wps[SCREEN_MAIN].data->old_backdrop); |
608 | #endif | 603 | #endif |
609 | if (2 == pitch_screen()) | 604 | if (2 == pitch_screen()) |
610 | return SYS_USB_CONNECTED; | 605 | return SYS_USB_CONNECTED; |
611 | #ifdef HAVE_LCD_COLOR | 606 | #ifdef HAVE_LCD_COLOR |
612 | if (wps_has_backdrop) | 607 | if (gui_wps[SCREEN_MAIN].data->has_backdrop) |
613 | lcd_set_backdrop(&wps_backdrop[0][0]); | 608 | lcd_set_backdrop(&wps_backdrop[0][0]); |
614 | #endif | 609 | #endif |
615 | restore = true; | 610 | restore = true; |
@@ -837,6 +832,9 @@ void wps_data_init(struct wps_data *wps_data) | |||
837 | wps_data->format_buffer[0] = '\0'; | 832 | wps_data->format_buffer[0] = '\0'; |
838 | wps_data->wps_loaded = false; | 833 | wps_data->wps_loaded = false; |
839 | wps_data->peak_meter_enabled = false; | 834 | wps_data->peak_meter_enabled = false; |
835 | #ifdef HAVE_LCD_COLOR | ||
836 | wps_data->has_backdrop = false; | ||
837 | #endif | ||
840 | } | 838 | } |
841 | 839 | ||
842 | static void wps_reset(struct wps_data *data) | 840 | static void wps_reset(struct wps_data *data) |
@@ -844,9 +842,6 @@ static void wps_reset(struct wps_data *data) | |||
844 | data->wps_loaded = false; | 842 | data->wps_loaded = false; |
845 | memset(&data->format_buffer, 0, sizeof data->format_buffer); | 843 | memset(&data->format_buffer, 0, sizeof data->format_buffer); |
846 | wps_data_init(data); | 844 | wps_data_init(data); |
847 | #ifdef HAVE_LCD_COLOR | ||
848 | wps_has_backdrop = false; | ||
849 | #endif | ||
850 | } | 845 | } |
851 | 846 | ||
852 | /* to setup up the wps-data from a format-buffer (isfile = false) | 847 | /* to setup up the wps-data from a format-buffer (isfile = false) |
@@ -1025,7 +1020,4 @@ void gui_sync_wps_init(void) | |||
1025 | gui_wps_set_data(&gui_wps[i], &wps_datas[i]); | 1020 | gui_wps_set_data(&gui_wps[i], &wps_datas[i]); |
1026 | gui_wps_set_statusbar(&gui_wps[i], &statusbars.statusbars[i]); | 1021 | gui_wps_set_statusbar(&gui_wps[i], &statusbars.statusbars[i]); |
1027 | } | 1022 | } |
1028 | #ifdef HAVE_LCD_COLOR | ||
1029 | wps_has_backdrop = false; | ||
1030 | #endif | ||
1031 | } | 1023 | } |
diff --git a/apps/gui/gwps.h b/apps/gui/gwps.h index 5c3b72603c..461c5c9d44 100644 --- a/apps/gui/gwps.h +++ b/apps/gui/gwps.h | |||
@@ -345,6 +345,10 @@ struct wps_data | |||
345 | int progress_end; | 345 | int progress_end; |
346 | bool wps_loaded; | 346 | bool wps_loaded; |
347 | bool peak_meter_enabled; | 347 | bool peak_meter_enabled; |
348 | #ifdef HAVE_LCD_COLOR | ||
349 | bool has_backdrop; | ||
350 | fb_data* old_backdrop; | ||
351 | #endif | ||
348 | }; | 352 | }; |
349 | 353 | ||
350 | /* initial setup of wps_data */ | 354 | /* initial setup of wps_data */ |