Remove CPPery for playlists

diff --git a/disobedience/disobedience.c b/disobedience/disobedience.c
index 9b050f4e1b1c5b796da72749263a1ad6410301f0..96bf5c67fd9da8c1681e3ad1abfe8bf8a3a0078f 100644 (file)
--- a/disobedience/disobedience.c
+++ b/disobedience/disobedience.c
@@ -490,9 +490,7 @@ int main(int argc, char **argv) {
   disorder_eclient_version(client, version_completed, 0);
   event_register("log-connected", check_rtp_address, 0);
   suppress_actions = 0;
   disorder_eclient_version(client, version_completed, 0);
   event_register("log-connected", check_rtp_address, 0);
   suppress_actions = 0;

-#if PLAYLISTS

   playlists_init();
   playlists_init();

-#endif

   /* If no password is set yet pop up a login box */
   if(!config->password)
     login_box();
   /* 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 001a0b0a88309b909642073c408b2a18355fad37..11da2c361a972408174a50ccc527435f94410bb0 100644 (file)
--- a/disobedience/disobedience.h
+++ b/disobedience/disobedience.h
@@ -22,8 +22,6 @@
 #ifndef DISOBEDIENCE_H
 #define DISOBEDIENCE_H
 
 #ifndef DISOBEDIENCE_H
 #define DISOBEDIENCE_H
 

-#define PLAYLISTS 1
-

 #include "common.h"
 
 #include <time.h>
 #include "common.h"
 
 #include <time.h>


@@ -259,7 +257,6 @@ void popup_settings(void);
 
 /* Playlists */
 
 
 /* Playlists */
 

-#if PLAYLISTS

 void playlists_init(void);
 void playlist_window_create(gpointer callback_data,
                             guint callback_action,
 void playlists_init(void);
 void playlist_window_create(gpointer callback_data,
                             guint callback_action,


@@ -269,7 +266,6 @@ extern int nplaylists;
 extern GtkWidget *menu_playlists_widget;
 extern GtkWidget *playlists_menu;
 extern GtkWidget *menu_editplaylists_widget;
 extern GtkWidget *menu_playlists_widget;
 extern GtkWidget *playlists_menu;
 extern GtkWidget *menu_editplaylists_widget;

-#endif

 
 #endif /* DISOBEDIENCE_H */
 
 
 #endif /* DISOBEDIENCE_H */
 

diff --git a/disobedience/menu.c b/disobedience/menu.c
index 6a265bad93095bc0ac70f24566245bbe8e8c2620..35667457272c4b2733545ec7052b84522794afa5 100644 (file)
--- a/disobedience/menu.c
+++ b/disobedience/menu.c
@@ -24,11 +24,9 @@
 static GtkWidget *selectall_widget;
 static GtkWidget *selectnone_widget;
 static GtkWidget *properties_widget;
 static GtkWidget *selectall_widget;
 static GtkWidget *selectnone_widget;
 static GtkWidget *properties_widget;

-#if PLAYLISTS

 GtkWidget *menu_playlists_widget;
 GtkWidget *playlists_menu;
 GtkWidget *menu_editplaylists_widget;
 GtkWidget *menu_playlists_widget;
 GtkWidget *playlists_menu;
 GtkWidget *menu_editplaylists_widget;

-#endif

 
 /** @brief Main menu widgets */
 GtkItemFactory *mainmenufactory;
 
 /** @brief Main menu widgets */
 GtkItemFactory *mainmenufactory;


@@ -298,7 +296,6 @@ GtkWidget *menubar(GtkWidget *w) {
       0,                                /* item_type */
       0                                 /* extra_data */
     },
       0,                                /* item_type */
       0                                 /* extra_data */
     },

-#if PLAYLISTS

     {
       (char *)"/Edit/Edit playlists",   /* path */
       0,                                /* accelerator */
     {
       (char *)"/Edit/Edit playlists",   /* path */
       0,                                /* accelerator */


@@ -307,7 +304,6 @@ GtkWidget *menubar(GtkWidget *w) {
       0,                                /* item_type */
       0                                 /* extra_data */
     },
       0,                                /* item_type */
       0                                 /* extra_data */
     },

-#endif

     
     
     {
     
     
     {


@@ -350,7 +346,6 @@ GtkWidget *menubar(GtkWidget *w) {
       (char *)"<CheckItem>",            /* item_type */
       0                                 /* extra_data */
     },
       (char *)"<CheckItem>",            /* item_type */
       0                                 /* extra_data */
     },

-#if PLAYLISTS

     {
       (char *)"/Control/Activate playlist", /* path */
       0,                                /* accelerator */
     {
       (char *)"/Control/Activate playlist", /* path */
       0,                                /* accelerator */


@@ -359,8 +354,7 @@ GtkWidget *menubar(GtkWidget *w) {
       (char *)"<Branch>",               /* item_type */
       0                                 /* extra_data */
     },
       (char *)"<Branch>",               /* item_type */
       0                                 /* extra_data */
     },

-#endif
-    
+

     {
       (char *)"/Help",                  /* path */
       0,                                /* accelerator */
     {
       (char *)"/Help",                  /* path */
       0,                                /* accelerator */


@@ -404,22 +398,18 @@ GtkWidget *menubar(GtkWidget *w) {
                                                 "<GdisorderMain>/Edit/Deselect all tracks");
   properties_widget = gtk_item_factory_get_widget(mainmenufactory,
                                                  "<GdisorderMain>/Edit/Track properties");
                                                 "<GdisorderMain>/Edit/Deselect all tracks");
   properties_widget = gtk_item_factory_get_widget(mainmenufactory,
                                                  "<GdisorderMain>/Edit/Track properties");

-#if PLAYLISTS

   menu_playlists_widget = gtk_item_factory_get_item(mainmenufactory,
                                                "<GdisorderMain>/Control/Activate playlist");
   playlists_menu = gtk_item_factory_get_widget(mainmenufactory,
                                                "<GdisorderMain>/Control/Activate playlist");
   menu_editplaylists_widget = gtk_item_factory_get_widget(mainmenufactory,
                                                      "<GdisorderMain>/Edit/Edit playlists");
   menu_playlists_widget = gtk_item_factory_get_item(mainmenufactory,
                                                "<GdisorderMain>/Control/Activate playlist");
   playlists_menu = gtk_item_factory_get_widget(mainmenufactory,
                                                "<GdisorderMain>/Control/Activate playlist");
   menu_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);
   assert(selectall_widget != 0);
   assert(selectnone_widget != 0);
   assert(properties_widget != 0);

-#if PLAYLISTS

   assert(menu_playlists_widget != 0);
   assert(playlists_menu != 0);
   assert(menu_editplaylists_widget != 0);
   assert(menu_playlists_widget != 0);
   assert(playlists_menu != 0);
   assert(menu_editplaylists_widget != 0);

-#endif

 
   GtkWidget *edit_widget = gtk_item_factory_get_widget(mainmenufactory,
                                                        "<GdisorderMain>/Edit");
 
   GtkWidget *edit_widget = gtk_item_factory_get_widget(mainmenufactory,
                                                        "<GdisorderMain>/Edit");

diff --git a/disobedience/playlists.c b/disobedience/playlists.c
index 5c02d8c24cb0fae21d7dbf532242a0aea4ea0aea..c10ef6f85e5fafb05a9c5fe1b022651b8cce7179 100644 (file)
--- a/disobedience/playlists.c
+++ b/disobedience/playlists.c
@@ -40,8 +40,6 @@
 #include "popup.h"
 #include "validity.h"
 
 #include "popup.h"
 #include "validity.h"
 

-#if PLAYLISTS
-

 static void playlist_list_received_playlists(void *v,
                                              const char *err,
                                              int nvec, char **vec);
 static void playlist_list_received_playlists(void *v,
                                              const char *err,
                                              int nvec, char **vec);


@@ -1312,8 +1310,6 @@ void playlists_init(void) {
   event_register("playlist-modified", playlist_editor_set_buttons, 0);
 }
 
   event_register("playlist-modified", playlist_editor_set_buttons, 0);
 }
 

-#endif
-

 /*
 Local Variables:
 c-basic-offset:2
 /*
 Local Variables:
 c-basic-offset:2