diff --git a/src/mpdclient.h b/src/mpdclient.h
index e73bd8a8f498e9739e3e45c19b98f76bb5996950..01294dbb48a1b8b3887a4e95a48f3506b46deaf0 100644 (file)
--- a/src/mpdclient.h
+++ b/src/mpdclient.h
#define MPDCLIENT_H
#include "playlist.h"
+#include "Compiler.h"
#include <mpd/client.h>
struct mpd_connection *connection;
+ /**
+ * This attribute is incremented whenever the connection changes
+ * (i.e. on disconnection and (re-)connection).
+ */
+ unsigned connection_id;
+
/**
* If this object is non-NULL, it tracks idle events. It is
* automatically called by mpdclient_get_connection() and
unsigned update_id;
/**
- * A bit mask of idle events occured since the last update.
+ * A bit mask of idle events occurred since the last update.
*/
enum mpd_idle events;
};
+enum {
+ /**
+ * all idle events the version of libmpdclient, ncmpc is compiled
+ * against, supports
+ */
+ MPD_IDLE_ALL = MPD_IDLE_DATABASE
+ | MPD_IDLE_STORED_PLAYLIST
+ | MPD_IDLE_QUEUE
+ | MPD_IDLE_PLAYER
+ | MPD_IDLE_MIXER
+ | 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 ***************************************************************/
bool
mpdclient_handle_error(struct mpdclient *c);
+static inline bool
+mpdclient_finish_command(struct mpdclient *c)
+{
+ return mpd_response_finish(c->connection)
+ ? true : mpdclient_handle_error(c);
+}
+
struct mpdclient *
mpdclient_new(void);
void mpdclient_free(struct mpdclient *c);
+gcc_pure
static inline bool
mpdclient_is_connected(const struct mpdclient *c)
{
return c->connection != NULL;
}
+gcc_pure
+static inline bool
+mpdclient_is_playing(const struct mpdclient *c)
+{
+ return c->status != NULL &&
+ (mpd_status_get_state(c->status) == MPD_STATE_PLAY ||
+ mpd_status_get_state(c->status) == MPD_STATE_PAUSE);
+}
+
+gcc_pure
static inline const struct mpd_song *
mpdclient_get_current_song(const struct mpdclient *c)
{
- return c->song != NULL && c->status != NULL &&
- (mpd_status_get_state(c->status) == MPD_STATE_PLAY ||
- mpd_status_get_state(c->status) == MPD_STATE_PAUSE)
+ return c->song != NULL && mpdclient_is_playing(c)
? c->song
: NULL;
}
bool
mpdclient_connect(struct mpdclient *c, const gchar *host, gint port,
- gfloat timeout_, const gchar *password);
+ unsigned timeout_ms, const gchar *password);
void
mpdclient_disconnect(struct mpdclient *c);
mpdclient_cmd_delete_range(struct mpdclient *c, unsigned start, unsigned end);
bool
-mpdclient_cmd_swap(struct mpdclient *c, gint old_index, gint new_index);
+mpdclient_cmd_move(struct mpdclient *c, unsigned dest, unsigned src);
+
+#if LIBMPDCLIENT_CHECK_VERSION(2,5,0)
+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);
+#endif
/*** playlist functions **************************************************/
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