X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fmpdclient.h;h=d51013fc8c4176b29b4b23e1b1ccf1a74c9a3573;hb=f1a456c2b13b8885bae41ddaa051447c3742e498;hp=1b52d06e9c739583f1ef11004bfeb935e8bc1e59;hpb=3c3ed8d8360835ac29315c22e392242711a01f2c;p=ncmpc.git

diff --git a/src/mpdclient.h b/src/mpdclient.h
index 1b52d06..d51013f 100644
--- a/src/mpdclient.h
+++ b/src/mpdclient.h
@@ -1,151 +1,233 @@
 #ifndef MPDCLIENT_H
 #define MPDCLIENT_H
 
-#include "libmpdclient.h"
+#include "config.h"
 #include "playlist.h"
-#include "filelist.h"
+#include "Compiler.h"
 
-#define MPD_VERSION_EQ(c,x,y,z) (c->connection->version[0] == x && \
-                                 c->connection->version[1] == y && \
-                                 c->connection->version[2] == z )
+#include <mpd/client.h>
 
-#define MPD_VERSION_LT(c,x,y,z) ( c->connection->version[0]<x  || \
- (c->connection->version[0]==x && c->connection->version[1]<y) || \
- (c->connection->version[0]==x && c->connection->version[1]==y && \
-  c->connection->version[2]<z) )
+struct filelist;
 
-typedef struct mpdclient {
-	/* playlist */
-	mpdclient_playlist_t playlist;
+struct mpdclient {
+#ifdef ENABLE_ASYNC_CONNECT
+	struct mpd_settings *settings;
+#else
+	const char *host;
+	unsigned port;
+#endif
 
-	/* Callbacks */
-	GList *error_callbacks;
-	GList *playlist_callbacks;
-	GList *browse_callbacks;
+	unsigned timeout_ms;
 
-	mpd_Connection *connection;
-	mpd_Status     *status;
-	mpd_Song       *song;
+	const char *password;
 
-	gboolean       need_update;
-} mpdclient_t;
+	/* playlist */
+	struct mpdclient_playlist playlist;
 
-/** functions ***************************************************************/
+#ifdef ENABLE_ASYNC_CONNECT
+	struct aconnect *async_connect;
+#endif
 
-gint
-mpdclient_finish_command(mpdclient_t *c);
+	struct mpd_connection *connection;
+
+	/**
+	 * Tracks idle events.  It is automatically called by
+	 * mpdclient_get_connection().
+	 */
+	struct mpd_glib_source *source;
+
+	struct mpd_status *status;
+	const struct mpd_song *song;
+
+	/**
+	 * The GLib source id which re-enters MPD idle mode before the
+	 * next main loop interation.
+	 */
+	unsigned enter_idle_source_id;
+
+	/**
+	 * This attribute is incremented whenever the connection changes
+	 * (i.e. on disconnection and (re-)connection).
+	 */
+	unsigned connection_id;
+
+	int volume;
+
+	/**
+	 * 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 {
+	/**
+	 * 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
+		| MPD_IDLE_STICKER
+		| MPD_IDLE_SUBSCRIPTION
+		| MPD_IDLE_MESSAGE
+};
 
-mpdclient_t *mpdclient_new(void);
-void mpdclient_free(mpdclient_t *c);
-gint mpdclient_connect(mpdclient_t *c, gchar *host, gint port,
-		       gfloat timeout_, gchar *password);
-gint mpdclient_disconnect(mpdclient_t *c);
-gint mpdclient_update(mpdclient_t *c);
+/** 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(const gchar *host, unsigned port,
+	      unsigned timeout_ms, const gchar *password);
+
+void mpdclient_free(struct mpdclient *c);
+
+/**
+ * Determine a human-readable "name" of the settings currently used to
+ * connect to MPD.
+ *
+ * @return an allocated string that needs to be freed (with g_free())
+ * by the caller
+ */
+char *
+mpdclient_settings_name(const struct mpdclient *c);
+
+gcc_pure
+static inline bool
+mpdclient_is_connected(const struct mpdclient *c)
+{
+	return c->connection != NULL;
+}
+
+/**
+ * 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
+#ifdef ENABLE_ASYNC_CONNECT
+		&& c->async_connect == NULL
+#endif
+		;
+}
+
+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 && mpdclient_is_playing(c)
+		? c->song
+		: NULL;
+}
+
+void
+mpdclient_connect(struct mpdclient *c);
+
+void
+mpdclient_disconnect(struct mpdclient *c);
+
+bool
+mpdclient_update(struct mpdclient *c);
+
+struct mpd_connection *
+mpdclient_get_connection(struct mpdclient *c);
 
 /*** MPD Commands  **********************************************************/
-gint mpdclient_cmd_play(mpdclient_t *c, gint index);
-gint mpdclient_cmd_pause(mpdclient_t *c, gint value);
-gint
-mpdclient_cmd_crop(mpdclient_t *c);
-gint mpdclient_cmd_stop(mpdclient_t *c);
-gint mpdclient_cmd_next(mpdclient_t *c);
-gint mpdclient_cmd_prev(mpdclient_t *c);
-gint mpdclient_cmd_seek(mpdclient_t *c, gint id, gint pos);
-gint mpdclient_cmd_shuffle(mpdclient_t *c);
-gint mpdclient_cmd_clear(mpdclient_t *c);
-gint mpdclient_cmd_repeat(mpdclient_t *c, gint value);
-gint mpdclient_cmd_random(mpdclient_t *c, gint value);
-gint mpdclient_cmd_crossfade(mpdclient_t *c, gint value);
-gint mpdclient_cmd_db_update(mpdclient_t *c, gchar *path);
-gint mpdclient_cmd_volume(mpdclient_t *c, gint value);
-gint mpdclient_cmd_add_path(mpdclient_t *c, gchar *path);
-
-gint mpdclient_cmd_add(mpdclient_t *c, struct mpd_song *song);
-gint mpdclient_cmd_delete(mpdclient_t *c, gint index);
-gint mpdclient_cmd_move(mpdclient_t *c, gint old_index, gint new_index);
-
-gint mpdclient_cmd_save_playlist(mpdclient_t *c, gchar *filename);
-gint mpdclient_cmd_load_playlist(mpdclient_t *c, gchar *filename_utf8);
-gint mpdclient_cmd_delete_playlist(mpdclient_t *c, gchar *filename_utf8);
-
-/* list functions */
-GList *mpdclient_get_artists(mpdclient_t *c);
-GList *mpdclient_get_albums(mpdclient_t *c, gchar *artist_utf8);
-
-
-/*** error callbacks *****************************************************/
-
-#define IS_ACK_ERROR(n)       (n & MPD_ERROR_ACK)
-#define GET_ACK_ERROR_CODE(n) ((n & 0xFF00) >> 8)
-
-typedef void (*mpdc_error_cb_t) (mpdclient_t *c, gint error, const gchar *msg);
-
-void mpdclient_install_error_callback(mpdclient_t *c, mpdc_error_cb_t cb);
-void mpdclient_remove_error_callback(mpdclient_t *c, mpdc_error_cb_t cb);
-
-/*** playlist functions  **************************************************/
-
-/* update the complete playlist */
-gint mpdclient_playlist_update(struct mpdclient *c);
-
-/* get playlist changes */
-gint mpdclient_playlist_update_changes(struct mpdclient *c);
-
-
-/*** mpdclient playlist callbacks *****************************************/
 
-#define PLAYLIST_EVENT_UPDATED     0x01
-#define PLAYLIST_EVENT_CLEAR       0x02
-#define PLAYLIST_EVENT_DELETE      0x03
-#define PLAYLIST_EVENT_ADD         0x04
-#define PLAYLIST_EVENT_MOVE        0x05
+bool
+mpdclient_cmd_crop(struct mpdclient *c);
 
+bool
+mpdclient_cmd_clear(struct mpdclient *c);
 
-typedef void (*mpdc_list_cb_t) (mpdclient_t *c, int event, gpointer data);
+bool
+mpdclient_cmd_volume(struct mpdclient *c, gint value);
 
-/* install a playlist callback function */
-void mpdclient_install_playlist_callback(mpdclient_t *c, mpdc_list_cb_t cb);
+bool
+mpdclient_cmd_volume_up(struct mpdclient *c);
 
-/* remove a playlist callback function */
-void mpdclient_remove_playlist_callback(mpdclient_t *c, mpdc_list_cb_t cb);
+bool
+mpdclient_cmd_volume_down(struct mpdclient *c);
 
+bool
+mpdclient_cmd_add_path(struct mpdclient *c, const gchar *path);
 
-/* issue a playlist callback */
-void mpdclient_playlist_callback(mpdclient_t *c, int event, gpointer data);
+bool
+mpdclient_cmd_add(struct mpdclient *c, const struct mpd_song *song);
 
+bool
+mpdclient_cmd_delete(struct mpdclient *c, gint index);
 
-/*** filelist functions  ***************************************************/
+bool
+mpdclient_cmd_delete_range(struct mpdclient *c, unsigned start, unsigned end);
 
-mpdclient_filelist_t *mpdclient_filelist_get(mpdclient_t *c, const gchar *path);
-mpdclient_filelist_t *mpdclient_filelist_search(mpdclient_t *c,
-						int exact_match,
-						int table,
-						gchar *filter_utf8);
-mpdclient_filelist_t *mpdclient_filelist_update(mpdclient_t *c,
-						mpdclient_filelist_t *flist);
+bool
+mpdclient_cmd_move(struct mpdclient *c, unsigned dest, unsigned src);
 
-/* add all songs in filelist to the playlist */
-int mpdclient_filelist_add_all(mpdclient_t *c, mpdclient_filelist_t *fl);
+bool
+mpdclient_cmd_subscribe(struct mpdclient *c, const char *channel);
 
-/*** mpdclient browse callbacks ********************************************/
+bool
+mpdclient_cmd_unsubscribe(struct mpdclient *c, const char *channel);
 
-#define BROWSE_DB_UPDATED          0x01
-#define BROWSE_PLAYLIST_SAVED      0x02
-#define BROWSE_PLAYLIST_DELETED    0x03
+bool
+mpdclient_cmd_send_message(struct mpdclient *c, const char *channel,
+			   const char *text);
 
+bool
+mpdclient_send_read_messages(struct mpdclient *c);
 
-/* install a playlist callback function */
-void mpdclient_install_browse_callback(mpdclient_t *c, mpdc_list_cb_t cb);
+struct mpd_message *
+mpdclient_recv_message(struct mpdclient *c);
 
-/* remove a playlist callback function */
-void mpdclient_remove_browse_callback(mpdclient_t *c, mpdc_list_cb_t cb);
+/*** playlist functions  **************************************************/
 
+/* update the complete playlist */
+bool
+mpdclient_playlist_update(struct mpdclient *c);
 
-/* issue a playlist callback */
-void mpdclient_browse_callback(mpdclient_t *c, int event, gpointer data);
+/* get playlist changes */
+bool
+mpdclient_playlist_update_changes(struct mpdclient *c);
 
-/* sort by list-format */
-gint compare_filelistentry_format(gconstpointer filelist_entry1, gconstpointer filelist_entry2);
+/* add all songs in filelist to the playlist */
+bool
+mpdclient_filelist_add_all(struct mpdclient *c, struct filelist *fl);
 
 #endif