README.rst: use double backticks

[ncmpc.git] / src / mpdclient.h

diff --git a/src/mpdclient.h b/src/mpdclient.h
index bac33383ab1bc33ccb34a614b5091fda8080f2cf..1d3b6e0b547d61f292480d6eff9da533230e4a03 100644 (file)
--- a/src/mpdclient.h
+++ b/src/mpdclient.h
@@ -1,6 +1,7 @@
 #ifndef MPDCLIENT_H
 #define MPDCLIENT_H
 
+#include "config.h"
 #include "playlist.h"
 #include "Compiler.h"
 
@@ -9,8 +10,26 @@
 struct filelist;
 
 struct mpdclient {
+#ifdef ENABLE_ASYNC_CONNECT
+       /**
+        * These settings are used to connect to MPD asynchronously.
+        */
+       struct mpd_settings *settings;
+
+#ifndef WIN32
+       /**
+        * A second set of settings, just in case #settings did not
+        * work.  This is only used if #settings refers to a local
+        * socket path, and this one is supposed to be a fallback to
+        * IP on the default port (6600).
+        */
+       struct mpd_settings *settings2;
+#endif
+
+#else
        const char *host;
        unsigned port;
+#endif
 
        unsigned timeout_ms;
 
@@ -19,6 +38,10 @@ struct mpdclient {
        /* playlist */
        struct mpdclient_playlist playlist;
 
+#ifdef ENABLE_ASYNC_CONNECT
+       struct aconnect *async_connect;
+#endif
+
        struct mpd_connection *connection;
 
        /**
@@ -49,6 +72,10 @@ struct mpdclient {
         */
        enum mpd_idle events;
 
+#if defined(ENABLE_ASYNC_CONNECT) && !defined(WIN32)
+       bool connecting2;
+#endif
+
        /**
         * This attribute is true when the connection is currently in
         * "idle" mode, and the #mpd_glib_source waits for an event.
@@ -97,6 +124,16 @@ mpdclient_new(const gchar *host, unsigned port,
 
 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)
@@ -112,7 +149,11 @@ gcc_pure
 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
@@ -133,7 +174,7 @@ mpdclient_get_current_song(const struct mpdclient *c)
                : NULL;
 }
 
-bool
+void
 mpdclient_connect(struct mpdclient *c);
 
 void