summaryrefslogtreecommitdiff
path: root/apps/wps-display.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/wps-display.c')
-rw-r--r--apps/wps-display.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/apps/wps-display.c b/apps/wps-display.c
index 3f94a09b9e..b629a06c4e 100644
--- a/apps/wps-display.c
+++ b/apps/wps-display.c
@@ -111,20 +111,13 @@ static void wps_format(char* fmt)
111 } 111 }
112} 112}
113 113
114bool wps_load_custom(char* file) 114bool wps_load(char* file, bool display)
115{ 115{
116 char buffer[FORMAT_BUFFER_SIZE]; 116 char buffer[FORMAT_BUFFER_SIZE];
117 int fd; 117 int fd;
118 bool special = true;
119 118
120 wps_loaded = true; 119 wps_loaded = true;
121 120
122 /* default wps file? */
123 if (!file) {
124 file = WPS_CONFIG;
125 special = false;
126 }
127
128 fd = open(file, O_RDONLY); 121 fd = open(file, O_RDONLY);
129 122
130 if (-1 != fd) 123 if (-1 != fd)
@@ -139,7 +132,7 @@ bool wps_load_custom(char* file)
139 132
140 close(fd); 133 close(fd);
141 134
142 if ( special ) { 135 if ( display ) {
143 int i; 136 int i;
144 lcd_clear_display(); 137 lcd_clear_display();
145#ifdef HAVE_LCD_BITMAP 138#ifdef HAVE_LCD_BITMAP
@@ -640,8 +633,6 @@ void wps_display(struct mp3entry* id3)
640 else 633 else
641 { 634 {
642 if (!wps_loaded) { 635 if (!wps_loaded) {
643 wps_load_custom(NULL);
644
645 if ( !format_buffer[0] ) { 636 if ( !format_buffer[0] ) {
646#ifdef HAVE_LCD_BITMAP 637#ifdef HAVE_LCD_BITMAP
647 wps_format("%s%fp\n" 638 wps_format("%s%fp\n"