From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Sat, 10 Oct 2009 20:06:36 +0000 (+0100)
Subject: Disable (incomplete) Disobedience playlist support.
X-Git-Tag: 5.0~86^2~3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/0b0fb26bbfa5a32d00cf3f234c5066648128df8e

Disable (incomplete) Disobedience playlist support.
---

diff --git a/disobedience/disobedience.c b/disobedience/disobedience.c
index 2b31941..7fad2eb 100644
--- a/disobedience/disobedience.c
+++ b/disobedience/disobedience.c
@@ -495,7 +495,9 @@ int main(int argc, char **argv) {
   disorder_eclient_version(client, version_completed, 0);
   event_register("log-connected", check_rtp_address, 0);
   suppress_actions = 0;
+#if PLAYLISTS
   playlists_init();
+#endif
   /* If no password is set yet pop up a login box */
   if(!config->password)
     login_box();
diff --git a/disobedience/disobedience.h b/disobedience/disobedience.h
index e34d383..f4678c7 100644
--- a/disobedience/disobedience.h
+++ b/disobedience/disobedience.h
@@ -254,6 +254,7 @@ void popup_settings(void);
 
 /* Playlists */
 
+#if PLAYLISTS
 void playlists_init(void);
 void edit_playlists(gpointer callback_data,
                     guint callback_action,
@@ -263,6 +264,7 @@ extern int nplaylists;
 extern GtkWidget *playlists_widget;
 extern GtkWidget *playlists_menu;
 extern GtkWidget *editplaylists_widget;
+#endif
 
 #endif /* DISOBEDIENCE_H */
 
diff --git a/disobedience/menu.c b/disobedience/menu.c
index f8bd58e..0243139 100644
--- a/disobedience/menu.c
+++ b/disobedience/menu.c
@@ -24,9 +24,11 @@
 static GtkWidget *selectall_widget;
 static GtkWidget *selectnone_widget;
 static GtkWidget *properties_widget;
+#if PLAYLISTS
 GtkWidget *playlists_widget;
 GtkWidget *playlists_menu;
 GtkWidget *editplaylists_widget;
+#endif
 
 /** @brief Main menu widgets */
 GtkItemFactory *mainmenufactory;
@@ -296,6 +298,7 @@ GtkWidget *menubar(GtkWidget *w) {
       0,                                /* item_type */
       0                                 /* extra_data */
     },
+#if PLAYLISTS
     {
       (char *)"/Edit/Edit playlists",   /* path */
       0,                                /* accelerator */
@@ -304,6 +307,7 @@ GtkWidget *menubar(GtkWidget *w) {
       0,                                /* item_type */
       0                                 /* extra_data */
     },
+#endif
     
     
     {
@@ -346,6 +350,7 @@ GtkWidget *menubar(GtkWidget *w) {
       (char *)"<CheckItem>",            /* item_type */
       0                                 /* extra_data */
     },
+#if PLAYLISTS
     {
       (char *)"/Control/Activate playlist", /* path */
       0,                                /* accelerator */
@@ -354,6 +359,7 @@ GtkWidget *menubar(GtkWidget *w) {
       (char *)"<Branch>",               /* item_type */
       0                                 /* extra_data */
     },
+#endif
     
     {
       (char *)"/Help",                  /* path */
@@ -398,18 +404,22 @@ GtkWidget *menubar(GtkWidget *w) {
 						 "<GdisorderMain>/Edit/Deselect all tracks");
   properties_widget = gtk_item_factory_get_widget(mainmenufactory,
 						  "<GdisorderMain>/Edit/Track properties");
+#if PLAYLISTS
   playlists_widget = gtk_item_factory_get_item(mainmenufactory,
                                                "<GdisorderMain>/Control/Activate playlist");
   playlists_menu = gtk_item_factory_get_widget(mainmenufactory,
                                                "<GdisorderMain>/Control/Activate playlist");
   editplaylists_widget = gtk_item_factory_get_widget(mainmenufactory,
                                                      "<GdisorderMain>/Edit/Edit playlists");
+#endif
   assert(selectall_widget != 0);
   assert(selectnone_widget != 0);
   assert(properties_widget != 0);
+#if PLAYLISTS
   assert(playlists_widget != 0);
   assert(playlists_menu != 0);
   assert(editplaylists_widget != 0);
+#endif
 
   GtkWidget *edit_widget = gtk_item_factory_get_widget(mainmenufactory,
                                                        "<GdisorderMain>/Edit");
diff --git a/disobedience/playlists.c b/disobedience/playlists.c
index 9184502..cd8979d 100644
--- a/disobedience/playlists.c
+++ b/disobedience/playlists.c
@@ -29,6 +29,8 @@
  */
 #include "disobedience.h"
 
+#if PLAYLISTS
+
 static void playlists_updated(void *v,
                               const char *err,
                               int nvec, char **vec);
@@ -324,6 +326,8 @@ void playlists_init(void) {
   playlists_update(0, 0, 0);
 }
 
+#endif
+
 /*
 Local Variables:
 c-basic-offset:2