Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/disorder

[disorder] / disobedience / choose.h

diff --git a/disobedience/choose.h b/disobedience/choose.h
index dea27b2..9496abd 100644 (file)
--- a/disobedience/choose.h
+++ b/disobedience/choose.h
@@ -15,6 +15,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+/** @file disobedience/choose.h
+ * @brief Choose window for Disobedience
+ */
 #ifndef CHOOSE_H
 #define CHOOSE_H
 
@@ -59,8 +62,9 @@ struct choosedata *choose_path_to_data(GtkTreePath *path);
 gboolean choose_button_event(GtkWidget *widget,
                              GdkEventButton *event,
                              gpointer user_data);
-void choose_play_completed(void attribute((unused)) *v,
-                           const char *err);
+void choose_play_completed(void *v,
+                           const char *err,
+                           const char *id);
 char *choose_get_track(GtkTreeIter *iter);
 char *choose_get_sort(GtkTreeIter *iter);
 char *choose_get_display(GtkTreeIter *iter);
@@ -76,6 +80,9 @@ void choose_next_clicked(GtkButton *button,
 void choose_prev_clicked(GtkButton *button,
                          gpointer userdata);
 void choose_search_new(void);
+void choose_menu_moretracks(const char *event,
+                            void *eventdata,
+                            void *callbackdata);
 
 #endif /* CHOOSE_H */