mpdclient: pass integer timeout to mpdclient_connect()

[ncmpc.git] / src / mpdclient.h

diff --git a/src/mpdclient.h b/src/mpdclient.h
index 9f22d268cc046e05b1c8279b0459231590e77a23..798e979c4d2bbcf73f006282b944627e71c97794 100644 (file)
--- a/src/mpdclient.h
+++ b/src/mpdclient.h
@@ -36,7 +36,7 @@ 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;
 };
@@ -57,19 +57,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 && c->status != NULL &&
-               (mpd_status_get_state(c->status) == MPD_STATE_PLAY ||
-                mpd_status_get_state(c->status) == MPD_STATE_PAUSE)
+       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);
@@ -120,7 +127,7 @@ bool
 mpdclient_cmd_delete_range(struct mpdclient *c, unsigned start, unsigned end);
 
 bool
-mpdclient_cmd_move(struct mpdclient *c, gint old_index, gint new_index);
+mpdclient_cmd_move(struct mpdclient *c, unsigned dest, unsigned src);
 
 /*** playlist functions  **************************************************/