X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fmpdclient.h;h=d46b8a1c71460a45162a94cfdbd9599940b73858;hb=473cfa9b9feef4348873865fd9503690b3207c0c;hp=1b83feb01d2c8e573110bf973ce916a378331d90;hpb=e3f743b9c57bec5a195947e5f5b97e2075374eb1;p=ncmpc.git

diff --git a/src/mpdclient.h b/src/mpdclient.h
index 1b83feb..d46b8a1 100644
--- a/src/mpdclient.h
+++ b/src/mpdclient.h
@@ -2,6 +2,7 @@
 #define MPDCLIENT_H
 
 #include "playlist.h"
+#include "mpdclient.h"
 
 #include <mpd/client.h>
 
@@ -12,6 +13,23 @@ struct mpdclient {
 	struct mpdclient_playlist playlist;
 
 	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.
+	 */
+	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;
 
@@ -19,16 +37,43 @@ struct mpdclient {
 	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 ***************************************************************/
 
-gint
+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);
 
@@ -40,9 +85,26 @@ mpdclient_is_connected(const struct mpdclient *c)
 	return c->connection != NULL;
 }
 
+G_GNUC_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);
+}
+
+static inline const struct mpd_song *
+mpdclient_get_current_song(const struct mpdclient *c)
+{
+	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);
@@ -50,6 +112,12 @@ mpdclient_disconnect(struct mpdclient *c);
 bool
 mpdclient_update(struct mpdclient *c);
 
+struct mpd_connection *
+mpdclient_get_connection(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.
@@ -58,32 +126,36 @@ void
 mpdclient_ui_error(const char *message);
 
 /*** MPD Commands  **********************************************************/
-gint mpdclient_cmd_play(struct mpdclient *c, gint index);
-gint
+
+bool
 mpdclient_cmd_crop(struct mpdclient *c);
-gint mpdclient_cmd_shuffle_range(struct mpdclient *c, guint start, guint end);
-gint mpdclient_cmd_clear(struct mpdclient *c);
-gint mpdclient_cmd_volume(struct mpdclient *c, gint value);
-gint mpdclient_cmd_volume_up(struct mpdclient *c);
-gint mpdclient_cmd_volume_down(struct mpdclient *c);
-gint mpdclient_cmd_add_path(struct mpdclient *c, const gchar *path);
 
-gint mpdclient_cmd_add(struct mpdclient *c, const struct mpd_song *song);
-gint mpdclient_cmd_delete(struct mpdclient *c, gint index);
-gint mpdclient_cmd_move(struct mpdclient *c, gint old_index, gint new_index);
+bool
+mpdclient_cmd_clear(struct mpdclient *c);
 
-gint mpdclient_cmd_save_playlist(struct mpdclient *c, const gchar *filename);
-gint mpdclient_cmd_load_playlist(struct mpdclient *c, const gchar *filename_utf8);
-gint mpdclient_cmd_delete_playlist(struct mpdclient *c, const gchar *filename_utf8);
+bool
+mpdclient_cmd_volume(struct mpdclient *c, gint value);
 
-/* list functions */
-GList *mpdclient_get_artists(struct mpdclient *c);
-GList *mpdclient_get_albums(struct mpdclient *c, const gchar *artist_utf8);
+bool
+mpdclient_cmd_volume_up(struct mpdclient *c);
 
+bool
+mpdclient_cmd_volume_down(struct mpdclient *c);
 
-/*** error callbacks *****************************************************/
+bool
+mpdclient_cmd_add_path(struct mpdclient *c, const gchar *path);
 
-#define GET_ACK_ERROR_CODE(n) ((n & 0xFF00) >> 8)
+bool
+mpdclient_cmd_add(struct mpdclient *c, const struct mpd_song *song);
+
+bool
+mpdclient_cmd_delete(struct mpdclient *c, gint index);
+
+bool
+mpdclient_cmd_delete_range(struct mpdclient *c, unsigned start, unsigned end);
+
+bool
+mpdclient_cmd_move(struct mpdclient *c, unsigned dest, unsigned src);
 
 /*** playlist functions  **************************************************/
 
@@ -95,19 +167,8 @@ mpdclient_playlist_update(struct mpdclient *c);
 bool
 mpdclient_playlist_update_changes(struct mpdclient *c);
 
-
-/*** filelist functions  ***************************************************/
-
-struct filelist *
-mpdclient_filelist_get(struct mpdclient *c, const gchar *path);
-
-struct filelist *
-mpdclient_filelist_search(struct mpdclient *c, int exact_match,
-			  enum mpd_tag_type tag,
-			  gchar *filter_utf8);
-
 /* add all songs in filelist to the playlist */
-int
+bool
 mpdclient_filelist_add_all(struct mpdclient *c, struct filelist *fl);
 
 /* sort by list-format */