mpdclient: remove unnecessary NULL check

[ncmpc.git] / src / mpdclient.h

diff --git a/src/mpdclient.h b/src/mpdclient.h
index 01294dbb48a1b8b3887a4e95a48f3506b46deaf0..84878466d22e7a08bc40f42330502745f4f048e9 100644 (file)
--- a/src/mpdclient.h
+++ b/src/mpdclient.h
@@ -14,21 +14,27 @@ struct mpdclient {
 
        struct mpd_connection *connection;
 
+       /**
+        * Tracks idle events.  It is automatically called by
+        * mpdclient_get_connection() and mpdclient_put_connection().
+        */
+       struct mpd_glib_source *source;
+
+       struct mpd_status *status;
+       const struct mpd_song *song;
+
        /**
         * This attribute is incremented whenever the connection changes
         * (i.e. on disconnection and (re-)connection).
         */
        unsigned connection_id;
 
+       int volume;
+
        /**
-        * 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.
+        * A bit mask of idle events occurred since the last update.
         */
-       struct mpd_glib_source *source;
+       enum mpd_idle events;
 
        /**
         * This attribute is true when the connection is currently in
@@ -36,16 +42,10 @@ struct mpdclient {
         */
        bool idle;
 
-       struct mpd_status *status;
-       const struct mpd_song *song;
-
-       int volume;
-       unsigned update_id;
-
        /**
-        * A bit mask of idle events occurred since the last update.
+        * Is MPD currently playing?
         */
-       enum mpd_idle events;
+       bool playing;
 };
 
 enum {
@@ -61,11 +61,9 @@ enum {
                | 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 ***************************************************************/
@@ -92,6 +90,17 @@ 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;
+}
+
 gcc_pure
 static inline bool
 mpdclient_is_playing(const struct mpdclient *c)
@@ -126,13 +135,6 @@ 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.
- */
-void
-mpdclient_ui_error(const char *message);
-
 /*** MPD Commands  **********************************************************/
 
 bool
@@ -165,7 +167,6 @@ mpdclient_cmd_delete_range(struct mpdclient *c, unsigned start, unsigned end);
 bool
 mpdclient_cmd_move(struct mpdclient *c, unsigned dest, unsigned src);
 
-#if LIBMPDCLIENT_CHECK_VERSION(2,5,0)
 bool
 mpdclient_cmd_subscribe(struct mpdclient *c, const char *channel);
 
@@ -181,7 +182,6 @@ mpdclient_send_read_messages(struct mpdclient *c);
 
 struct mpd_message *
 mpdclient_recv_message(struct mpdclient *c);
-#endif
 
 /*** playlist functions  **************************************************/
 
@@ -197,10 +197,4 @@ mpdclient_playlist_update_changes(struct mpdclient *c);
 bool
 mpdclient_filelist_add_all(struct mpdclient *c, struct filelist *fl);
 
-/* sort by song format */
-gcc_pure
-gint compare_filelistentry_format(gconstpointer filelist_entry1,
-                                 gconstpointer filelist_entry2,
-                                 const char *song_format);
-
 #endif