require libmpdclient 2.9, remove several #ifdefs

[ncmpc.git] / src / mpdclient.h

diff --git a/src/mpdclient.h b/src/mpdclient.h
index e9234805d6443f88692fb2c689c208cd11b28921..f2204fb4a44230d6c8091ea3b973dc529a008beb 100644 (file)
--- a/src/mpdclient.h
+++ b/src/mpdclient.h
@@ -2,7 +2,7 @@
 #define MPDCLIENT_H
 
 #include "playlist.h"
-#include "mpdclient.h"
+#include "Compiler.h"
 
 #include <mpd/client.h>
 
@@ -61,11 +61,9 @@ enum {
                | MPD_IDLE_OUTPUT
                | MPD_IDLE_OPTIONS
                | MPD_IDLE_UPDATE
-#if LIBMPDCLIENT_CHECK_VERSION(2,5,0)
                | MPD_IDLE_STICKER
                | MPD_IDLE_SUBSCRIPTION
                | MPD_IDLE_MESSAGE
-#endif
 };
 
 /** functions ***************************************************************/
@@ -85,14 +83,14 @@ mpdclient_new(void);
 
 void mpdclient_free(struct mpdclient *c);
 
-G_GNUC_PURE
+gcc_pure
 static inline bool
 mpdclient_is_connected(const struct mpdclient *c)
 {
        return c->connection != NULL;
 }
 
-G_GNUC_PURE
+gcc_pure
 static inline bool
 mpdclient_is_playing(const struct mpdclient *c)
 {
@@ -101,7 +99,7 @@ mpdclient_is_playing(const struct mpdclient *c)
                 mpd_status_get_state(c->status) == MPD_STATE_PAUSE);
 }
 
-G_GNUC_PURE
+gcc_pure
 static inline const struct mpd_song *
 mpdclient_get_current_song(const struct mpdclient *c)
 {
@@ -165,6 +163,22 @@ mpdclient_cmd_delete_range(struct mpdclient *c, unsigned start, unsigned end);
 bool
 mpdclient_cmd_move(struct mpdclient *c, unsigned dest, unsigned src);
 
+bool
+mpdclient_cmd_subscribe(struct mpdclient *c, const char *channel);
+
+bool
+mpdclient_cmd_unsubscribe(struct mpdclient *c, const char *channel);
+
+bool
+mpdclient_cmd_send_message(struct mpdclient *c, const char *channel,
+                          const char *text);
+
+bool
+mpdclient_send_read_messages(struct mpdclient *c);
+
+struct mpd_message *
+mpdclient_recv_message(struct mpdclient *c);
+
 /*** playlist functions  **************************************************/
 
 /* update the complete playlist */
@@ -179,7 +193,10 @@ mpdclient_playlist_update_changes(struct mpdclient *c);
 bool
 mpdclient_filelist_add_all(struct mpdclient *c, struct filelist *fl);
 
-/* sort by list-format */
-gint compare_filelistentry_format(gconstpointer filelist_entry1, gconstpointer filelist_entry2);
+/* sort by song format */
+gcc_pure
+gint compare_filelistentry_format(gconstpointer filelist_entry1,
+                                 gconstpointer filelist_entry2,
+                                 const char *song_format);
 
 #endif