screen_song: make Path a proper label

[ncmpc.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index a57f35dfcf27f610fe44972828b23af34b3c76f1..1e7caeea8444a346c003466851c80ab3f254c5fa 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -112,6 +112,7 @@ exit_and_cleanup(void)
        }
 }
 
+#ifndef WIN32
 static void
 catch_sigint(G_GNUC_UNUSED int sig)
 {
@@ -157,6 +158,7 @@ catch_sigwinch(G_GNUC_UNUSED int sig)
        if (1 != write(sigwinch_pipes[1], &irrelevant, 1))
                exit(EXIT_FAILURE);
 }
+#endif /* WIN32 */
 
 static void
 idle_callback(enum mpd_error error,
@@ -269,7 +271,12 @@ default_settings_name(void)
 
        return name;
 #else
-       return g_strdup(options.host);
+       /*
+        * localhost is actually not correct, we only know that
+        * mpd_connection_new() has connected to the "default host".
+        */
+       const char *name = options.host ?: "localhost";
+       return g_strdup(name);
 #endif
 }
 
@@ -286,12 +293,7 @@ connection_settings_name(const struct mpd_connection *connection)
 #else
        (void)connection;
 
-       /*
-        * localhost is actually not correct, we only know that
-        * mpd_connection_new() has connected to the "default host".
-        */
-       const char *name = options.host ?: "localhost";
-       return g_strdup(name);
+       return default_settings_name();
 #endif
 }
 
@@ -358,9 +360,7 @@ timer_reconnect(G_GNUC_UNUSED gpointer data)
        doupdate();
 
        /* update immediately */
-       mpd->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;
+       mpd->events = MPD_IDLE_ALL;
 
        do_mpd_update();
 
@@ -391,7 +391,7 @@ idle_callback(enum mpd_error error, enum mpd_server_error server_error,
 
        c->idle = false;
 
-       assert(mpdclient_get_connection(c) != NULL);
+       assert(mpdclient_is_connected(c));
 
        if (error != MPD_ERROR_SUCCESS) {
                char *allocated;
@@ -542,7 +542,9 @@ timer_check_key_bindings(G_GNUC_UNUSED gpointer data)
 int
 main(int argc, const char *argv[])
 {
+#ifndef WIN32
        struct sigaction act;
+#endif
 #ifdef ENABLE_LOCALE
 #ifndef ENABLE_NLS
        G_GNUC_UNUSED
@@ -595,6 +597,7 @@ main(int argc, const char *argv[])
        /* parse command line options - 2 pass */
        options_parse(argc, argv);
 
+#ifndef WIN32
        /* setup signal behavior - SIGINT */
        sigemptyset(&act.sa_mask);
        act.sa_flags = 0;
@@ -644,6 +647,7 @@ main(int argc, const char *argv[])
                perror("sigaction(SIGPIPE)");
                exit(EXIT_FAILURE);
        }
+#endif
 
        ncu_init();
 
@@ -673,6 +677,7 @@ main(int argc, const char *argv[])
        }
 #endif
 
+#ifndef WIN32
        if (!pipe(sigwinch_pipes) &&
                !fcntl(sigwinch_pipes[1], F_SETFL, O_NONBLOCK)) {
                sigwinch_channel = g_io_channel_unix_new(sigwinch_pipes[0]);
@@ -682,6 +687,7 @@ main(int argc, const char *argv[])
                perror("sigwinch pipe creation failed");
                exit(EXIT_FAILURE);
        }
+#endif
 
        /* attempt to connect */
        reconnect_source_id = g_timeout_add(1, timer_reconnect, NULL);