diff --git a/src/mpdclient.h b/src/mpdclient.h
index 371d42935ecff3374fe9646162b4274c0eb98fc6..b00709748eff7d99436d46d6675feb10a8535dd4 100644 (file)
--- a/src/mpdclient.h
+++ b/src/mpdclient.h
#ifndef MPDCLIENT_H
#define MPDCLIENT_H
+#include "config.h"
#include "playlist.h"
#include "Compiler.h"
struct filelist;
struct mpdclient {
+#ifdef ENABLE_ASYNC_CONNECT
+ struct mpd_settings *settings;
+#else
const char *host;
unsigned port;
+#endif
unsigned timeout_ms;
/* playlist */
struct mpdclient_playlist playlist;
+#ifdef ENABLE_ASYNC_CONNECT
+ struct aconnect *async_connect;
+#endif
+
struct mpd_connection *connection;
/**
* Tracks idle events. It is automatically called by
- * mpdclient_get_connection() and mpdclient_put_connection().
+ * 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).
static inline bool
mpdclient_is_dead(const struct mpdclient *c)
{
- return c->connection == NULL;
+ return c->connection == NULL
+#ifdef ENABLE_ASYNC_CONNECT
+ && c->async_connect == NULL
+#endif
+ ;
}
gcc_pure
: NULL;
}
-bool
+void
mpdclient_connect(struct mpdclient *c);
void
struct mpd_connection *
mpdclient_get_connection(struct mpdclient *c);
-void
-mpdclient_put_connection(struct mpdclient *c);
-
/*** MPD Commands **********************************************************/
bool