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

[ncmpc.git] / src / screen_file.c

diff --git a/src/screen_file.c b/src/screen_file.c
index f7b3b567e4110a750c6ffb123e7211cc079ff73c..515937750980757325ab5aedeb6dd18dfd3e101c 100644 (file)
--- a/src/screen_file.c
+++ b/src/screen_file.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
@@ -21,6 +21,7 @@
 #include "screen_browser.h"
 #include "screen_interface.h"
 #include "screen_message.h"
+#include "screen_queue.h"
 #include "screen.h"
 #include "config.h"
 #include "i18n.h"
@@ -28,7 +29,6 @@
 #include "mpdclient.h"
 #include "filelist.h"
 #include "screen_utils.h"
-#include "screen_play.h"
 #include "screen_client.h"
 
 #include <mpd/client.h>
@@ -52,10 +52,24 @@ screen_file_repaint(void)
 }
 
 static void
-screen_file_reload(struct mpdclient *c)
+screen_file_load_list(struct mpdclient *c, struct filelist *filelist)
 {
        struct mpd_connection *connection;
 
+       connection = mpdclient_get_connection(c);
+       if (connection == NULL)
+               return;
+
+       mpd_send_list_meta(connection, current_path);
+       filelist_recv(filelist, connection);
+
+       if (mpdclient_finish_command(c))
+               filelist_sort_dir_play(filelist, compare_filelist_entry_path);
+}
+
+static void
+screen_file_reload(struct mpdclient *c)
+{
        if (browser.filelist != NULL)
                filelist_free(browser.filelist);
 
@@ -64,19 +78,7 @@ screen_file_reload(struct mpdclient *c)
                /* add a dummy entry for ./.. */
                filelist_append(browser.filelist, NULL);
 
-       if (!mpdclient_is_connected(c))
-               return;
-
-       connection = mpdclient_get_connection(c);
-
-       mpd_send_list_meta(connection, current_path);
-       filelist_recv(browser.filelist, connection);
-
-       if (mpd_response_finish(connection))
-               filelist_sort_dir_play(browser.filelist,
-                                      compare_filelist_entry_path);
-       else
-               mpdclient_handle_error(c);
+       screen_file_load_list(c, browser.filelist);
 
        list_window_set_length(browser.lw,
                               filelist_length(browser.filelist));
@@ -93,9 +95,7 @@ change_directory(struct mpdclient *c, const char *new_path)
 
        screen_file_reload(c);
 
-#ifndef NCMPC_MINI
        screen_browser_sync_highlights(browser.filelist, &c->playlist);
-#endif
 
        list_window_reset(browser.lw);
 
@@ -164,17 +164,16 @@ screen_file_handle_enter(struct mpdclient *c)
        return change_to_entry(c, entry);
 }
 
-static int
+static void
 handle_save(struct mpdclient *c)
 {
        struct list_window_range range;
        const char *defaultname = NULL;
        char *defaultname_utf8 = NULL;
-       int ret;
 
        list_window_get_range(browser.lw, &range);
        if (range.start == range.end)
-               return -1;
+               return;
 
        for (unsigned i = range.start; i < range.end; ++i) {
                struct filelist_entry *entry =
@@ -191,13 +190,11 @@ handle_save(struct mpdclient *c)
 
        if(defaultname)
                defaultname_utf8 = utf8_to_locale(defaultname);
-       ret = playlist_save(c, NULL, defaultname_utf8);
+       playlist_save(c, NULL, defaultname_utf8);
        g_free(defaultname_utf8);
-
-       return ret;
 }
 
-static int
+static void
 handle_delete(struct mpdclient *c)
 {
        struct mpd_connection *connection = mpdclient_get_connection(c);
@@ -207,6 +204,9 @@ handle_delete(struct mpdclient *c)
        char *str, *buf;
        int key;
 
+       if (connection == NULL)
+               return;
+
        list_window_get_range(browser.lw, &range);
        for (unsigned i = range.start; i < range.end; ++i) {
                struct filelist_entry *entry =
@@ -234,7 +234,7 @@ handle_delete(struct mpdclient *c)
                if( key != YES[0] ) {
                        /* translators: a dialog was aborted by the user */
                        screen_status_printf(_("Aborted"));
-                       return 0;
+                       return;
                }
 
                if (!mpd_run_rm(connection, mpd_playlist_get_path(playlist))) {
@@ -248,7 +248,6 @@ handle_delete(struct mpdclient *c)
                   user */
                screen_status_printf(_("Playlist deleted"));
        }
-       return 0;
 }
 
 static void
@@ -279,6 +278,7 @@ static void
 screen_file_open(struct mpdclient *c)
 {
        screen_file_reload(c);
+       screen_browser_sync_highlights(browser.filelist, &c->playlist);
 }
 
 static const char *
@@ -308,7 +308,7 @@ screen_file_get_title(char *str, size_t size)
 static void
 screen_file_paint(void)
 {
-       list_window_paint(browser.lw, browser_lw_callback, browser.filelist);
+       screen_browser_paint(&browser);
 }
 
 static void
@@ -319,18 +319,14 @@ screen_file_update(struct mpdclient *c)
                screen_file_reload(c);
        }
 
-#ifndef NCMPC_MINI
-       if (c->events & (MPD_IDLE_DATABASE | MPD_IDLE_STORED_PLAYLIST |
-                        MPD_IDLE_PLAYLIST))
-               screen_browser_sync_highlights(browser.filelist, &c->playlist);
-#endif
-
        if (c->events & (MPD_IDLE_DATABASE | MPD_IDLE_STORED_PLAYLIST
 #ifndef NCMPC_MINI
-                        | MPD_IDLE_PLAYLIST
+                        | MPD_IDLE_QUEUE
 #endif
-                        ))
+                        )) {
+               screen_browser_sync_highlights(browser.filelist, &c->playlist);
                screen_file_repaint();
+       }
 }
 
 static bool
@@ -362,9 +358,7 @@ screen_file_cmd(struct mpdclient *c, command_t cmd)
 
        case CMD_SCREEN_UPDATE:
                screen_file_reload(c);
-#ifndef NCMPC_MINI
                screen_browser_sync_highlights(browser.filelist, &c->playlist);
-#endif
                screen_file_repaint();
                return false;