summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/settings_menu.c9
-rw-r--r--apps/wps.c5
-rw-r--r--apps/wps.h5
3 files changed, 16 insertions, 3 deletions
diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index 4d3a0ed6c5..21b61d7093 100644
--- a/apps/settings_menu.c
+++ b/apps/settings_menu.c
@@ -86,8 +86,13 @@ static void wps_set(void)
86 char* names[] = { "ID3 Tags", "File ", "Parse " }; 86 char* names[] = { "ID3 Tags", "File ", "Parse " };
87 set_option("[WPS display]", &global_settings.wps_display, names, 3 ); 87 set_option("[WPS display]", &global_settings.wps_display, names, 3 );
88#else 88#else
89 char* names[] = { "1 Line ID3", "2 Line ID3", "File ", 89 char* names[] = { "1 Line ID3", "2 Line ID3", "File ","Parse ",
90 "Parse ", "Custom WPS " }; 90#ifdef CUSTOM_WPS
91 "Custom WPS " };
92#else
93 };
94#endif
95
91 set_option("[WPS display]", &global_settings.wps_display, names, 5 ); 96 set_option("[WPS display]", &global_settings.wps_display, names, 5 );
92#endif 97#endif
93} 98}
diff --git a/apps/wps.c b/apps/wps.c
index 3198e75d20..6445b6bbf7 100644
--- a/apps/wps.c
+++ b/apps/wps.c
@@ -201,17 +201,20 @@ static void draw_screen(struct mp3entry* id3)
201 lcd_puts_scroll(0, 0, buffer); 201 lcd_puts_scroll(0, 0, buffer);
202 break; 202 break;
203 } 203 }
204#ifdef CUSTOM_WPS
204 case PLAY_DISPLAY_CUSTOM_WPS: 205 case PLAY_DISPLAY_CUSTOM_WPS:
205 { 206 {
206 wps_load_custom_config(); 207 wps_load_custom_config();
207 } 208 }
208#endif 209#endif
210#endif
209 } 211 }
210 } 212 }
211 status_draw(); 213 status_draw();
212 lcd_update(); 214 lcd_update();
213} 215}
214 216
217#ifdef CUSTOM_WPS
215int wps_load_custom_config(void) 218int wps_load_custom_config(void)
216{ 219{
217 char buffer[128]; 220 char buffer[128];
@@ -339,7 +342,7 @@ int wps_load_custom_config(void)
339 snprintf(buffer, sizeof(buffer), "%s%s", buffer, tmpbuf); 342 snprintf(buffer, sizeof(buffer), "%s%s", buffer, tmpbuf);
340 } 343 }
341} 344}
342 345#endif
343 346
344int player_id3_show(void) 347int player_id3_show(void)
345{ 348{
diff --git a/apps/wps.h b/apps/wps.h
index eb77767cff..a65a9fda6a 100644
--- a/apps/wps.h
+++ b/apps/wps.h
@@ -21,9 +21,14 @@
21#include "id3.h" 21#include "id3.h"
22#include "playlist.h" 22#include "playlist.h"
23 23
24/* #define CUSTOM_WPS */
25
24extern bool keys_locked; 26extern bool keys_locked;
25 27
26int wps_show(void); 28int wps_show(void);
29
30#ifdef CUSTOM_WPS
27int wps_load_custom_config(void); 31int wps_load_custom_config(void);
32#endif
28 33
29#endif 34#endif