mpdclient: automatically re-enter idle mode, eliminate mpdclient_put_connection()

[ncmpc.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 953f715afeaa81af9eba12d75f7e0af064ceaa30..8ade659e69ddc0f997fa2bfe46a74a6754568998 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -33,6 +33,7 @@
 #include "player_command.h"
 #include "keyboard.h"
 #include "lirc.h"
+#include "signals.h"
 
 #ifndef NCMPC_MINI
 #include "conf.h"
@@ -62,7 +63,6 @@ static const guint update_interval = 500;
 static struct mpdclient *mpd = NULL;
 static GMainLoop *main_loop;
 static guint reconnect_source_id, update_source_id;
-static int sigwinch_pipes[2];
 
 #ifndef NCMPC_MINI
 static guint check_key_bindings_source_id;
@@ -88,36 +88,6 @@ update_xterm_title(void)
 }
 #endif
 
-#ifndef WIN32
-static void
-catch_sigint(gcc_unused int sig)
-{
-       g_main_loop_quit(main_loop);
-}
-
-static gboolean
-sigwinch_event(gcc_unused GIOChannel *source,
-               gcc_unused GIOCondition condition, gcc_unused gpointer data)
-{
-       char ignoreme[64];
-       if (1 > read(sigwinch_pipes[0], ignoreme, 64))
-               exit(EXIT_FAILURE);
-
-       endwin();
-       refresh();
-       screen_resize(mpd);
-
-       return TRUE;
-}
-
-static void
-catch_sigwinch(gcc_unused int sig)
-{
-       if (1 != write(sigwinch_pipes[1], "", 1))
-               exit(EXIT_FAILURE);
-}
-#endif /* WIN32 */
-
 static gboolean
 timer_mpd_update(gpointer data);
 
@@ -178,7 +148,6 @@ do_mpd_update(void)
        screen_update(mpd);
        mpd->events = 0;
 
-       mpdclient_put_connection(mpd);
        check_reconnect();
 }
 
@@ -231,10 +200,7 @@ timer_reconnect(gcc_unused gpointer data)
        g_free(name);
        doupdate();
 
-       mpdclient_disconnect(mpd);
-       mpdclient_connect(mpd, options.host, options.port,
-                         options.timeout_ms,
-                         options.password);
+       mpdclient_connect(mpd);
 
        return FALSE;
 }
@@ -341,7 +307,6 @@ void end_input_event(void)
        screen_update(mpd);
        mpd->events = 0;
 
-       mpdclient_put_connection(mpd);
        check_reconnect();
        auto_update_timer();
 }
@@ -446,59 +411,6 @@ main(int argc, const char *argv[])
        /* parse command line options - 2 pass */
        options_parse(argc, argv);
 
-#ifndef WIN32
-       /* setup signal behavior - SIGINT */
-       struct sigaction act;
-       sigemptyset(&act.sa_mask);
-       act.sa_flags = 0;
-       act.sa_handler = catch_sigint;
-       if (sigaction(SIGINT, &act, NULL) < 0) {
-               perror("signal");
-               exit(EXIT_FAILURE);
-       }
-
-       /* setup signal behavior - SIGTERM */
-
-       act.sa_handler = catch_sigint;
-       if (sigaction(SIGTERM, &act, NULL) < 0) {
-               perror("sigaction()");
-               exit(EXIT_FAILURE);
-       }
-
-       /* setup signal behavior - SIGCONT */
-
-       act.sa_handler = catch_sigwinch;
-       if (sigaction(SIGCONT, &act, NULL) < 0) {
-               perror("sigaction(SIGCONT)");
-               exit(EXIT_FAILURE);
-       }
-
-       /* setup signal behaviour - SIGHUP*/
-
-       act.sa_handler = catch_sigint;
-       if (sigaction(SIGHUP, &act, NULL) < 0) {
-               perror("sigaction(SIGHUP)");
-               exit(EXIT_FAILURE);
-       }
-
-       /* setup SIGWINCH */
-
-       act.sa_flags = SA_RESTART;
-       act.sa_handler = catch_sigwinch;
-       if (sigaction(SIGWINCH, &act, NULL) < 0) {
-               perror("sigaction(SIGWINCH)");
-               exit(EXIT_FAILURE);
-       }
-
-       /* ignore SIGPIPE */
-
-       act.sa_handler = SIG_IGN;
-       if (sigaction(SIGPIPE, &act, NULL) < 0) {
-               perror("sigaction(SIGPIPE)");
-               exit(EXIT_FAILURE);
-       }
-#endif
-
        ncu_init();
 
 #ifdef ENABLE_LYRICS_SCREEN
@@ -506,7 +418,9 @@ main(int argc, const char *argv[])
 #endif
 
        /* create mpdclient instance */
-       mpd = mpdclient_new();
+       mpd = mpdclient_new(options.host, options.port,
+                           options.timeout_ms,
+                           options.password);
 
        /* initialize curses */
        screen_init(mpd);
@@ -520,18 +434,7 @@ main(int argc, const char *argv[])
        /* watch out for lirc input */
        ncmpc_lirc_init();
 
-#ifndef WIN32
-       if (!pipe(sigwinch_pipes) &&
-               !fcntl(sigwinch_pipes[1], F_SETFL, O_NONBLOCK)) {
-               GIOChannel *sigwinch_channel = g_io_channel_unix_new(sigwinch_pipes[0]);
-               g_io_add_watch(sigwinch_channel, G_IO_IN, sigwinch_event, NULL);
-               g_io_channel_unref(sigwinch_channel);
-       }
-       else {
-               perror("sigwinch pipe creation failed");
-               exit(EXIT_FAILURE);
-       }
-#endif
+       signals_init(main_loop, mpd);
 
        /* attempt to connect */
        reconnect_source_id = g_timeout_add(1, timer_reconnect, NULL);
@@ -561,9 +464,7 @@ main(int argc, const char *argv[])
                g_source_remove(check_key_bindings_source_id);
 #endif
 
-       close(sigwinch_pipes[0]);
-       close(sigwinch_pipes[1]);
-
+       signals_deinit();
        ncmpc_lirc_deinit();
 
        screen_exit();