X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/9eeb9f121e6f5bea8307f5a90bdae6359c4a3211..ada57e739dcd4a90cf5809e5fe08473f06741618:/disobedience/disobedience.h

diff --git a/disobedience/disobedience.h b/disobedience/disobedience.h
index 33cd9ad..001a0b0 100644
--- a/disobedience/disobedience.h
+++ b/disobedience/disobedience.h
@@ -2,20 +2,18 @@
  * This file is part of DisOrder.
  * Copyright (C) 2006-2008 Richard Kettlewell
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 /** @file disobedience/disobedience.h
  * @brief Header file for Disobedience, the DisOrder GTK+ client
@@ -24,6 +22,8 @@
 #ifndef DISOBEDIENCE_H
 #define DISOBEDIENCE_H
 
+#define PLAYLISTS 1
+
 #include "common.h"
 
 #include <time.h>
@@ -49,10 +49,12 @@
 #include "eventdist.h"
 #include "split.h"
 #include "timeval.h"
+#include "uaudio.h"
 
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdk/gdkkeysyms.h>
 
 /* Types ------------------------------------------------------------------- */
 
@@ -60,28 +62,6 @@ struct queuelike;
 struct choosenode;
 struct progress_window;
 
-/** @brief Callback data structure
- *
- * This program is extremely heavily callback-driven.  Rather than have
- * numerous different callback structures we have a single one which can be
- * interpreted adequately both by success and error handlers.
- */
-struct callbackdata {
-  void (*onerror)(struct callbackdata *cbd,
-                  int code,
-		  const char *msg);     /* called on error */
-  union {
-    const char *key;                    /* gtkqueue.c op_part_lookup */
-    struct choosenode *choosenode;      /* gtkchoose.c got_files/got_dirs */
-    struct queuelike *ql;               /* gtkqueue.c queuelike_completed */
-    struct prefdata *f;                 /* properties.c */
-    const char *user;                   /* users.c */
-    struct {
-      const char *user, *email;         /* users.c */
-    } edituser;
-  } u;
-};
-
 /** @brief Per-tab callbacks
  *
  * Some of the options in the main menu depend on which tab is displayed, so we
@@ -123,10 +103,10 @@ extern int playing;                     /* true if playing some track */
 extern int volume_l, volume_r;          /* current volume */
 extern double goesupto;                 /* volume upper bound */
 extern int choosealpha;                 /* break up choose by letter */
-extern GtkTooltips *tips;
 extern int rtp_supported;
 extern int rtp_is_running;
 extern GtkItemFactory *mainmenufactory;
+extern const struct uaudio *backend;
 
 extern const disorder_eclient_log_callbacks log_callbacks;
 
@@ -139,7 +119,8 @@ void popup_protocol_error(int code,
                           const char *msg);
 /* Report an error */
 
-void properties(int ntracks, const char **tracks);
+void properties(int ntracks, const char **tracks,
+                GtkWidget *parent);
 /* Pop up a properties window for a list of tracks */
 
 GtkWidget *scroll_widget(GtkWidget *child);
@@ -156,7 +137,8 @@ void popup_submsg(GtkWidget *parent, GtkMessageType mt, const char *msg);
 
 void fpopup_msg(GtkMessageType mt, const char *fmt, ...);
 
-struct progress_window *progress_window_new(const char *title);
+struct progress_window *progress_window_new(const char *title,
+                                            GtkWidget *parent);
 /* Pop up a progress window */
 
 void progress_window_progress(struct progress_window *pw,
@@ -216,6 +198,7 @@ const char *namepart(const char *track,
                      const char *context,
                      const char *part);
 long namepart_length(const char *track);
+char *namepart_resolve(const char *track);
 
 void namepart_update(const char *track,
                      const char *context,
@@ -231,7 +214,9 @@ void choose_update(void);
 /* Called when we think the choose tree might need updating */
 
 void play_completed(void *v,
-                    const char *error);
+                    const char *err);
+
+extern const GtkTargetEntry choose_targets[];
 
 /* Login details */
 
@@ -272,6 +257,20 @@ void load_settings(void);
 void set_tool_colors(GtkWidget *w);
 void popup_settings(void);
 
+/* Playlists */
+
+#if PLAYLISTS
+void playlists_init(void);
+void playlist_window_create(gpointer callback_data,
+                            guint callback_action,
+                            GtkWidget  *menu_item);
+extern char **playlists;
+extern int nplaylists;
+extern GtkWidget *menu_playlists_widget;
+extern GtkWidget *playlists_menu;
+extern GtkWidget *menu_editplaylists_widget;
+#endif
+
 #endif /* DISOBEDIENCE_H */
 
 /*