X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/6acdbba4d904b8ee764f0d564675357a46d43fa8..f326f12d2a097236a173c97abc6717626b715ae3:/disobedience/disobedience.h
diff --git a/disobedience/disobedience.h b/disobedience/disobedience.h
index 547cfc8..11da2c3 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 .
*/
/** @file disobedience/disobedience.h
* @brief Header file for Disobedience, the DisOrder GTK+ client
@@ -49,6 +47,7 @@
#include "eventdist.h"
#include "split.h"
#include "timeval.h"
+#include "uaudio.h"
#include
#include
@@ -102,10 +101,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;
@@ -118,7 +117,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);
@@ -135,7 +135,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,
@@ -213,6 +214,8 @@ void choose_update(void);
void play_completed(void *v,
const char *err);
+extern const GtkTargetEntry choose_targets[];
+
/* Login details */
void login_box(void);
@@ -255,14 +258,14 @@ void popup_settings(void);
/* Playlists */
void playlists_init(void);
-void edit_playlists(gpointer callback_data,
- guint callback_action,
- GtkWidget *menu_item);
+void playlist_window_create(gpointer callback_data,
+ guint callback_action,
+ GtkWidget *menu_item);
extern char **playlists;
extern int nplaylists;
-extern GtkWidget *playlists_widget;
+extern GtkWidget *menu_playlists_widget;
extern GtkWidget *playlists_menu;
-extern GtkWidget *editplaylists_widget;
+extern GtkWidget *menu_editplaylists_widget;
#endif /* DISOBEDIENCE_H */