X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/baaccf85fc7ff0b65ca062faffc5091f0a0acc62..444be90901ad09e78d0ff2a92872f43a510f5425:/disobedience/disobedience.h diff --git a/disobedience/disobedience.h b/disobedience/disobedience.h index 91d07de..719eea4 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 @@ -86,6 +85,11 @@ struct button { void (*clicked)(GtkButton *button, gpointer userdata); const char *tip; GtkWidget *widget; + void (*pack)(GtkBox *box, + GtkWidget *child, + gboolean expand, + gboolean fill, + guint padding); }; /* Variables --------------------------------------------------------------- */ @@ -102,10 +106,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 +122,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 +140,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, @@ -160,6 +166,7 @@ void all_update(void); GtkWidget *menubar(GtkWidget *w); /* Create the menu bar */ +int full_mode; void users_set_sensitive(int sensitive); @@ -173,6 +180,7 @@ extern int suppress_actions; /* Queue/Recent/Added */ GtkWidget *queue_widget(void); +GtkWidget *playing_widget(void); GtkWidget *recent_widget(void); GtkWidget *added_widget(void); /* Create widgets for displaying the queue, the recently played list and the @@ -213,6 +221,8 @@ void choose_update(void); void play_completed(void *v, const char *err); +extern const GtkTargetEntry choose_targets[]; + /* Login details */ void login_box(void); @@ -225,7 +235,7 @@ void manage_users(void); /* Help */ -void popup_help(void); +void popup_help(const char *what); /* RTP */ @@ -252,6 +262,18 @@ void load_settings(void); void set_tool_colors(GtkWidget *w); void popup_settings(void); +/* 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 /* DISOBEDIENCE_H */ /*