Merge remote branches 'jn/cosmetics', 'jn/doxygen' and 'jn/renames'

[ncmpc.git] / src / screen_outputs.c

diff --git a/src/screen_outputs.c b/src/screen_outputs.c
index e4c3bc6cc618e90160b264d988f041d078cb9667..888aa34f1f9edcbb970564e173f746443e5809db 100644 (file)
--- a/src/screen_outputs.c
+++ b/src/screen_outputs.c
@@ -1,25 +1,25 @@
 /* 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
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "screen_outputs.h"
 #include "screen_interface.h"
-#include "screen_message.h"
+#include "screen_status.h"
 #include "paint.h"
 #include "i18n.h"
 #include "list_window.h"
@@ -52,11 +52,13 @@ toggle_output(struct mpdclient *c, unsigned int output_index)
 
        assert(mpd_outputs != NULL);
 
-       if (!mpdclient_is_connected(c) ||
-           output_index >= mpd_outputs->len)
+       if (output_index >= mpd_outputs->len)
                return false;
 
        connection = mpdclient_get_connection(c);
+       if (connection == NULL)
+               return false;
+
        output = g_ptr_array_index(mpd_outputs, output_index);
 
        if (!mpd_output_get_enabled(output)) {
@@ -102,6 +104,11 @@ clear_outputs_list(void)
 
        g_ptr_array_foreach(mpd_outputs, clear_output_element, NULL);
        g_ptr_array_remove_range(mpd_outputs, 0, mpd_outputs->len);
+
+       /* not updating the list_window length here, because that
+          would clear the cursor position, and fill_outputs_list()
+          will be called after this function anyway */
+       /* list_window_set_length(lw, 0); */
 }
 
 static void
@@ -112,17 +119,18 @@ fill_outputs_list(struct mpdclient *c)
 
        assert(mpd_outputs != NULL);
 
-       if (!mpdclient_is_connected(c))
+       connection = mpdclient_get_connection(c);
+       if (connection == NULL) {
+               list_window_set_length(lw, 0);
                return;
+       }
 
-       connection = mpdclient_get_connection(c);
        mpd_send_outputs(connection);
        while ((output = mpd_recv_output(connection)) != NULL) {
                g_ptr_array_add(mpd_outputs, output);
        }
 
-       if (!mpd_response_finish(connection))
-               mpdclient_handle_error(c);
+       mpdclient_finish_command(c);
 
        list_window_set_length(lw, mpd_outputs->len);
 }
@@ -236,7 +244,7 @@ const struct screen_functions screen_outputs = {
        .close     = outputs_close,
        .resize    = outputs_resize,
        .paint     = outputs_paint,
-       .update = screen_outputs_update,
+       .update    = screen_outputs_update,
        .cmd       = outputs_cmd,
        .get_title = outputs_title,
 };