command.c: put curly braces around a single large statement

[ncmpc.git] / src / mpdclient.c

diff --git a/src/mpdclient.c b/src/mpdclient.c
index 0a93bc9a4bd40a3dcda2e519b465459114a09eb3..ce1eed5972de92bda9ef4db76a0aa7682d60dc92 100644 (file)
--- a/src/mpdclient.c
+++ b/src/mpdclient.c
@@ -1,5 +1,5 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
 
  * This program is free software; you can redistribute it and/or modify
@@ -83,13 +83,6 @@ mpdclient_handle_error(struct mpdclient *c)
        return false;
 }
 
-static bool
-mpdclient_finish_command(struct mpdclient *c)
-{
-       return mpd_response_finish(c->connection)
-               ? true : mpdclient_handle_error(c);
-}
-
 struct mpdclient *
 mpdclient_new(void)
 {
@@ -136,24 +129,22 @@ mpdclient_disconnect(struct mpdclient *c)
                c->song = NULL;
 
        /* everything has changed after a disconnect */
-       c->events |= 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;
+       c->events |= MPD_IDLE_ALL;
 }
 
 bool
 mpdclient_connect(struct mpdclient *c,
                  const gchar *host,
                  gint port,
-                 gfloat _timeout,
+                 unsigned timeout_ms,
                  const gchar *password)
 {
        /* close any open connection */
-       if( c->connection )
+       if (c->connection)
                mpdclient_disconnect(c);
 
        /* connect to MPD */
-       c->connection = mpd_connection_new(host, port, _timeout * 1000);
+       c->connection = mpd_connection_new(host, port, timeout_ms);
        if (c->connection == NULL)
                g_error("Out of memory");
 
@@ -177,7 +168,6 @@ bool
 mpdclient_update(struct mpdclient *c)
 {
        struct mpd_connection *connection = mpdclient_get_connection(c);
-       bool retval;
 
        c->volume = -1;
 
@@ -216,23 +206,26 @@ mpdclient_update(struct mpdclient *c)
 
        /* check if the playlist needs an update */
        if (c->playlist.version != mpd_status_get_queue_version(c->status)) {
+               bool retval;
+
                if (c->source == NULL)
-                       c->events |= MPD_IDLE_PLAYLIST;
+                       c->events |= MPD_IDLE_QUEUE;
 
                if (!playlist_is_empty(&c->playlist))
                        retval = mpdclient_playlist_update_changes(c);
                else
                        retval = mpdclient_playlist_update(c);
-       } else
-               retval = true;
+               if (!retval)
+                       return false;
+       }
 
        /* update the current song */
-       if (!c->song || mpd_status_get_song_id(c->status)) {
+       if (!c->song || mpd_status_get_song_id(c->status) >= 0) {
                c->song = playlist_get_song(&c->playlist,
                                            mpd_status_get_song_pos(c->status));
        }
 
-       return retval;
+       return true;
 }
 
 struct mpd_connection *
@@ -284,15 +277,12 @@ mpdclient_cmd_crop(struct mpdclient *c)
        struct mpd_connection *connection;
        int length, current;
 
-       if (c->status == NULL)
+       if (!mpdclient_is_playing(c))
                return false;
 
        length = mpd_status_get_queue_length(c->status);
        current = mpd_status_get_song_pos(c->status);
-       if (current < 0 ||
-           (mpd_status_get_state(c->status) != MPD_STATE_PLAY &&
-            mpd_status_get_state(c->status) != MPD_STATE_PAUSE) ||
-           mpd_status_get_queue_length(c->status) < 2)
+       if (current < 0 || mpd_status_get_queue_length(c->status) < 2)
                return true;
 
        connection = mpdclient_get_connection(c);
@@ -338,10 +328,6 @@ mpdclient_cmd_clear(struct mpdclient *c)
        if (status == NULL)
                return false;
 
-       if (c->status != NULL)
-               mpd_status_free(c->status);
-       c->status = status;
-
        if (!mpd_response_finish(connection))
                return mpdclient_handle_error(c);
 
@@ -353,6 +339,7 @@ mpdclient_cmd_clear(struct mpdclient *c)
                   reducing the UI latency */
                playlist_clear(&c->playlist);
                c->playlist.version = mpd_status_get_queue_version(status);
+               c->song = NULL;
        }
 
        c->events |= MPD_IDLE_QUEUE;
@@ -416,8 +403,8 @@ mpdclient_cmd_add_path(struct mpdclient *c, const gchar *path_utf8)
        if (connection == NULL)
                return false;
 
-       mpd_send_add(connection, path_utf8);
-       return mpdclient_finish_command(c);
+       return mpd_send_add(connection, path_utf8)?
+               mpdclient_finish_command(c) : false;
 }
 
 bool
@@ -446,7 +433,7 @@ mpdclient_cmd_add(struct mpdclient *c, const struct mpd_song *song)
            !mpd_response_next(connection))
                return mpdclient_handle_error(c);
 
-       c->events |= MPD_IDLE_PLAYLIST;
+       c->events |= MPD_IDLE_QUEUE;
 
        status = mpdclient_recv_status(c);
        if (status == NULL)
@@ -505,7 +492,7 @@ mpdclient_cmd_delete(struct mpdclient *c, gint idx)
            !mpd_command_list_end(connection))
                return mpdclient_handle_error(c);
 
-       c->events |= MPD_IDLE_PLAYLIST;
+       c->events |= MPD_IDLE_QUEUE;
 
        status = mpdclient_recv_status(c);
        if (status == NULL)
@@ -587,7 +574,7 @@ mpdclient_cmd_delete_range(struct mpdclient *c, unsigned start, unsigned end)
            !mpd_command_list_end(connection))
                return mpdclient_handle_error(c);
 
-       c->events |= MPD_IDLE_PLAYLIST;
+       c->events |= MPD_IDLE_QUEUE;
 
        status = mpdclient_recv_status(c);
        if (status == NULL)