Changed CUSTOM_WPS to be a define-only feature until it is more complete. To include it, simply uncomment the #define CUSTOM_WPS line in wps.h

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1924 a1c6a512-1295-4272-9138-f99709370657

3 files changed, 16 insertions, 3 deletions

diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index 4d3a0ed..21b61d7 100644
--- a/apps/settings_menu.c
+++ b/apps/settings_menu.c
@@ -86,8 +86,13 @@ static void wps_set(void)
     char* names[] = { "ID3 Tags", "File     ", "Parse    " };
     set_option("[WPS display]", &global_settings.wps_display, names, 3 );
 #else
-    char* names[] = { "1 Line ID3", "2 Line ID3", "File      ",
-            "Parse     ", "Custom WPS " };
+    char* names[] = { "1 Line ID3", "2 Line ID3", "File      ","Parse     ",
+#ifdef CUSTOM_WPS
+ "Custom WPS " };
+#else
+ };
+#endif
+
     set_option("[WPS display]", &global_settings.wps_display, names, 5 );
 #endif
 }
diff --git a/apps/wps.c b/apps/wps.c
index 3198e75..6445b6b 100644
--- a/apps/wps.c
+++ b/apps/wps.c
@@ -201,17 +201,20 @@ static void draw_screen(struct mp3entry* id3)
                 lcd_puts_scroll(0, 0, buffer);
                 break;
             }
+#ifdef CUSTOM_WPS
             case PLAY_DISPLAY_CUSTOM_WPS:
             {
                 wps_load_custom_config();
             }
 #endif
+#endif
         }
     }
     status_draw();
     lcd_update();
 }
 
+#ifdef CUSTOM_WPS
 int wps_load_custom_config(void)
 {
     char buffer[128];
@@ -339,7 +342,7 @@ int wps_load_custom_config(void)
     snprintf(buffer, sizeof(buffer), "%s%s", buffer, tmpbuf);
     }
 }
-
+#endif
 
 int player_id3_show(void)
 {
diff --git a/apps/wps.h b/apps/wps.h
index eb77767..a65a9fd 100644
--- a/apps/wps.h
+++ b/apps/wps.h
@@ -21,9 +21,14 @@
 #include "id3.h"
 #include "playlist.h" 
 
+/* #define CUSTOM_WPS */
+
 extern bool keys_locked;
 
 int wps_show(void);
+
+#ifdef CUSTOM_WPS
 int wps_load_custom_config(void);
+#endif
 
 #endif