diff --git a/src/mpdclient.h b/src/mpdclient.h
index 7cdf7f5da121021f1726fe5a703e3489a944bbcf..84878466d22e7a08bc40f42330502745f4f048e9 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;
/**
- * If this object is non-NULL, it tracks idle events. It is
- * automatically called by mpdclient_get_connection() and
- * mpdclient_put_connection(). It is not created by the
- * mpdclient library; the user of this library has to
- * initialize it. However, it is freed when the MPD
- * connection is closed.
+ * Tracks idle events. It is automatically called by
+ * mpdclient_get_connection() and mpdclient_put_connection().
*/
struct mpd_glib_source *source;
- /**
- * This attribute is true when the connection is currently in
- * "idle" mode, and the #mpd_glib_source waits for an event.
- */
- bool idle;
-
struct mpd_status *status;
const struct mpd_song *song;
+ /**
+ * This attribute is incremented whenever the connection changes
+ * (i.e. on disconnection and (re-)connection).
+ */
+ unsigned connection_id;
+
int volume;
- unsigned update_id;
/**
* A bit mask of idle events occurred since the last update.
*/
enum mpd_idle events;
+
+ /**
+ * This attribute is true when the connection is currently in
+ * "idle" mode, and the #mpd_glib_source waits for an event.
+ */
+ bool idle;
+
+ /**
+ * Is MPD currently playing?
+ */
+ bool playing;
};
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 ***************************************************************/
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;
}
-G_GNUC_PURE
+/**
+ * Is this object "dead"? i.e. not connected and not currently doing
+ * anything to connect.
+ */
+gcc_pure
+static inline bool
+mpdclient_is_dead(const struct mpdclient *c)
+{
+ return c->connection == NULL;
+}
+
+gcc_pure
static inline bool
mpdclient_is_playing(const struct mpdclient *c)
{
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)
{
void
mpdclient_put_connection(struct mpdclient *c);
-/**
- * To be implemented by the application: mpdclient.c calls this to
- * display an error message.
- */
-void
-mpdclient_ui_error(const char *message);
-
/*** MPD Commands **********************************************************/
bool
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 */
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);
-
#endif