summaryrefslogtreecommitdiff
path: root/apps/gui
diff options
context:
space:
mode:
Diffstat (limited to 'apps/gui')
-rw-r--r--apps/gui/gwps-common.c6
-rw-r--r--apps/gui/gwps.c43
-rw-r--r--apps/gui/gwps.h3
3 files changed, 5 insertions, 47 deletions
diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c
index 699635df1d..87c6a9ce63 100644
--- a/apps/gui/gwps-common.c
+++ b/apps/gui/gwps-common.c
@@ -2083,11 +2083,11 @@ bool gui_wps_display(void)
2083 "%al%pc/%pt%ar[%pp:%pe]\n" 2083 "%al%pc/%pt%ar[%pp:%pe]\n"
2084 "%fbkBit %?fv<avg|> %?iv<(id3v%iv)|(no id3)>\n" 2084 "%fbkBit %?fv<avg|> %?iv<(id3v%iv)|(no id3)>\n"
2085 "%pb\n" 2085 "%pb\n"
2086 "%pm\n", false, false); 2086 "%pm\n", false);
2087#else 2087#else
2088 wps_data_load(gui_wps[i].data, 2088 wps_data_load(gui_wps[i].data,
2089 "%s%pp/%pe: %?it<%it|%fn> - %?ia<%ia|%d2> - %?id<%id|%d1>\n" 2089 "%s%pp/%pe: %?it<%it|%fn> - %?ia<%ia|%d2> - %?id<%id|%d1>\n"
2090 "%pc%?ps<*|/>%pt\n", false, false); 2090 "%pc%?ps<*|/>%pt\n", false);
2091#endif 2091#endif
2092 } 2092 }
2093#if NB_SCREENS == 2 2093#if NB_SCREENS == 2
@@ -2099,7 +2099,7 @@ bool gui_wps_display(void)
2099 "%s%?it<%?in<%in. |>%it|%fn>\n" 2099 "%s%?it<%?in<%in. |>%it|%fn>\n"
2100 "%al%pc/%pt%ar[%pp:%pe]\n" 2100 "%al%pc/%pt%ar[%pp:%pe]\n"
2101 "%fbkBit %?fv<avg|> %?iv<(id3v%iv)|(no id3)>\n" 2101 "%fbkBit %?fv<avg|> %?iv<(id3v%iv)|(no id3)>\n"
2102 "%pb", false, false); 2102 "%pb", false);
2103 } 2103 }
2104#endif 2104#endif
2105 } 2105 }
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c
index bd7591fb37..efe207f94a 100644
--- a/apps/gui/gwps.c
+++ b/apps/gui/gwps.c
@@ -752,10 +752,8 @@ static void wps_reset(struct wps_data *data)
752 from a (wps-)file (isfile = true)*/ 752 from a (wps-)file (isfile = true)*/
753bool wps_data_load(struct wps_data *wps_data, 753bool wps_data_load(struct wps_data *wps_data,
754 const char *buf, 754 const char *buf,
755 bool isfile, 755 bool isfile)
756 bool display)
757{ 756{
758 int i, s;
759 int fd; 757 int fd;
760 758
761 if(!wps_data || !buf) 759 if(!wps_data || !buf)
@@ -832,45 +830,6 @@ bool wps_data_load(struct wps_data *wps_data,
832 830
833 close(fd); 831 close(fd);
834 832
835 if ( display ) {
836 bool any_defined_line;
837 int z;
838 FOR_NB_SCREENS(z)
839 screens[z].clear_display();
840#ifdef HAVE_LCD_BITMAP
841 FOR_NB_SCREENS(z)
842 screens[z].setmargins(0,0);
843#endif
844 for (s=0; s<WPS_MAX_SUBLINES; s++)
845 {
846 any_defined_line = false;
847 for (i=0; i<WPS_MAX_LINES; i++)
848 {
849 if (wps_data->format_lines[i][s] &&
850 wps_data->format_lines[i][s][0])
851 {
852 FOR_NB_SCREENS(z)
853 screens[z].puts(0, i,
854 wps_data->
855 format_lines[i][s]);
856 any_defined_line = true;
857 }
858 else
859 {
860 FOR_NB_SCREENS(z)
861 screens[z].puts(0, i, " ");
862 }
863 }
864 if (any_defined_line)
865 {
866#ifdef HAVE_LCD_BITMAP
867 FOR_NB_SCREENS(z)
868 screens[z].update();
869#endif
870 sleep(HZ/2);
871 }
872 }
873 }
874 wps_data->wps_loaded = true; 833 wps_data->wps_loaded = true;
875 834
876 return start > 0; 835 return start > 0;
diff --git a/apps/gui/gwps.h b/apps/gui/gwps.h
index 4072e17cfa..54b3d1ec64 100644
--- a/apps/gui/gwps.h
+++ b/apps/gui/gwps.h
@@ -282,8 +282,7 @@ void wps_data_init(struct wps_data *wps_data);
282 from a (wps-)file (isfile = true)*/ 282 from a (wps-)file (isfile = true)*/
283bool wps_data_load(struct wps_data *wps_data, 283bool wps_data_load(struct wps_data *wps_data,
284 const char *buf, 284 const char *buf,
285 bool isfile, 285 bool isfile);
286 bool display);
287 286
288/* wps_data end */ 287/* wps_data end */
289 288