main: require MPD 0.16

[ncmpc.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index fa16de1f46dc0e196059f217b12e725fff6689a5..33678eecb9c05c76367b76c23bc0459cbb7a8270 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -15,7 +15,7 @@
  * 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 "config.h"
 #include "ncmpc.h"
@@ -27,7 +27,7 @@
 #include "ncu.h"
 #include "screen.h"
 #include "screen_utils.h"
-#include "screen_message.h"
+#include "screen_status.h"
 #include "strfsong.h"
 #include "i18n.h"
 #include "player_command.h"
@@ -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,
@@ -240,7 +242,7 @@ settings_name(const struct mpd_settings *settings)
 {
        const char *host = mpd_settings_get_host(settings);
        if (host == NULL)
-               host = "unknown";
+               host = _("unknown");
 
        if (host[0] == '/')
                return g_strdup(host);
@@ -262,14 +264,19 @@ default_settings_name(void)
                mpd_settings_new(options.host, options.port, 0,
                                 NULL, options.password);
        if (settings == NULL)
-               return g_strdup("unknown");
+               return g_strdup(_("unknown"));
 
        char *name = settings_name(settings);
        mpd_settings_free(settings);
 
        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
 }
 
@@ -280,12 +287,13 @@ connection_settings_name(const struct mpd_connection *connection)
        const struct mpd_settings *settings =
                mpd_connection_get_settings(connection);
        if (settings == NULL)
-               return g_strdup("unknown");
+               return g_strdup(_("unknown"));
 
        return settings_name(settings);
 #else
        (void)connection;
-       return g_strdup(options.host);
+
+       return default_settings_name();
 #endif
 }
 
@@ -305,14 +313,14 @@ timer_reconnect(G_GNUC_UNUSED gpointer data)
 
        char *name = default_settings_name();
        screen_status_printf(_("Connecting to %s...  [Press %s to abort]"),
-                            name, get_key_names(CMD_QUIT,0) );
+                            name, get_key_names(CMD_QUIT, false));
        g_free(name);
        doupdate();
 
        mpdclient_disconnect(mpd);
        success = mpdclient_connect(mpd,
                                    options.host, options.port,
-                                   1.5,
+                                   options.timeout_ms,
                                    options.password);
        if (!success) {
                /* try again in 5 seconds */
@@ -324,13 +332,13 @@ timer_reconnect(G_GNUC_UNUSED gpointer data)
        connection = mpdclient_get_connection(mpd);
 
 #ifndef NCMPC_MINI
-       /* quit if mpd is pre 0.11.0 - song id not supported by mpd */
-       if (mpd_connection_cmp_server_version(connection, 0, 12, 0) < 0) {
+       /* quit if mpd is pre 0.14 - song id not supported by mpd */
+       if (mpd_connection_cmp_server_version(connection, 0, 16, 0) < 0) {
                const unsigned *version =
                        mpd_connection_get_server_version(connection);
                screen_status_printf(_("Error: MPD version %d.%d.%d is to old (%s needed)"),
                                     version[0], version[1], version[2],
-                                    "0.12.0");
+                                    "0.16.0");
                mpdclient_disconnect(mpd);
                doupdate();
 
@@ -341,10 +349,8 @@ timer_reconnect(G_GNUC_UNUSED gpointer data)
        }
 #endif
 
-       if (mpd_connection_cmp_server_version(connection,
-                                             0, 14, 0) >= 0)
-               mpd->source = mpd_glib_new(connection,
-                                          idle_callback, mpd);
+       mpd->source = mpd_glib_new(connection,
+                                  idle_callback, mpd);
 
        name = connection_settings_name(connection);
        screen_status_printf(_("Connected to %s"), name);
@@ -352,9 +358,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();
 
@@ -374,7 +378,7 @@ check_reconnect(void)
 
 /**
  * This function is called by the gidle.c library when MPD sends us an
- * idle event (or when the connectiond dies).
+ * idle event (or when the connection dies).
  */
 static void
 idle_callback(enum mpd_error error, enum mpd_server_error server_error,
@@ -382,12 +386,10 @@ idle_callback(enum mpd_error error, enum mpd_server_error server_error,
              void *ctx)
 {
        struct mpdclient *c = ctx;
-       struct mpd_connection *connection;
 
        c->idle = false;
 
-       connection = mpdclient_get_connection(c);
-       assert(connection != NULL);
+       assert(mpdclient_is_connected(c));
 
        if (error != MPD_ERROR_SUCCESS) {
                char *allocated;
@@ -523,7 +525,7 @@ timer_check_key_bindings(G_GNUC_UNUSED gpointer data)
           and this is a hint for the user what to press to correct
           that */
        g_snprintf(comment, sizeof(comment), _("press %s for the key editor"),
-                  get_key_names(CMD_SCREEN_KEYDEF, 0));
+                  get_key_names(CMD_SCREEN_KEYDEF, false));
        g_strlcat(buf, comment, sizeof(buf));
        g_strlcat(buf, ")", sizeof(buf));
 #endif
@@ -538,8 +540,13 @@ 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
+#endif
        const char *charset = NULL;
 #endif
        GIOChannel *keyboard_channel;
@@ -588,6 +595,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;
@@ -637,6 +645,7 @@ main(int argc, const char *argv[])
                perror("sigaction(SIGPIPE)");
                exit(EXIT_FAILURE);
        }
+#endif
 
        ncu_init();
 
@@ -666,6 +675,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]);
@@ -675,6 +685,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);