chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge Disobedience playlist support.
[disorder]
/
disobedience
/
disobedience.h
diff --git
a/disobedience/disobedience.h
b/disobedience/disobedience.h
index 173b30b8a30ae41e4935573c63f84dcef6227dc7..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>
@@
-119,7
+117,8
@@
void popup_protocol_error(int code,
const char *msg);
/* Report an error */
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);
/* Pop up a properties window for a list of tracks */
GtkWidget *scroll_widget(GtkWidget *child);
@@
-136,7
+135,8
@@
void popup_submsg(GtkWidget *parent, GtkMessageType mt, const char *msg);
void fpopup_msg(GtkMessageType mt, const char *fmt, ...);
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,
/* Pop up a progress window */
void progress_window_progress(struct progress_window *pw,
@@
-214,6
+214,8
@@
void choose_update(void);
void play_completed(void *v,
const char *err);
void play_completed(void *v,
const char *err);
+extern const GtkTargetEntry choose_targets[];
+
/* Login details */
void login_box(void);
/* Login details */
void login_box(void);
@@
-255,17
+257,15
@@
void popup_settings(void);
/* Playlists */
/* Playlists */
-#if PLAYLISTS
void playlists_init(void);
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 char **playlists;
extern int nplaylists;
-extern GtkWidget *playlists_widget;
+extern GtkWidget *
menu_
playlists_widget;
extern GtkWidget *playlists_menu;
extern GtkWidget *playlists_menu;
-extern GtkWidget *editplaylists_widget;
-#endif
+extern GtkWidget *menu_editplaylists_widget;
#endif /* DISOBEDIENCE_H */
#endif /* DISOBEDIENCE_H */