diff --git a/src/main.c b/src/main.c
index d4c5168a251694d539964e9ff70adf82bc6fd545..11e46e4a698bef6c81717468ed20ea72cc446e44 100644 (file)
--- a/src/main.c
+++ b/src/main.c
const struct mpd_song *song = mpd->song;
char tmp[BUFSIZE];
+ const char *new_title = NULL;
if (options.xterm_title_format && mpd->playing && song)
- strfsong(tmp, BUFSIZE, options.xterm_title_format, song);
- else
- g_strlcpy(tmp, PACKAGE " version " VERSION, BUFSIZE);
+ new_title = strfsong(tmp, BUFSIZE, options.xterm_title_format, song) > 0
+ ? tmp
+ : NULL;
+
+ if (new_title == NULL)
+ new_title = PACKAGE " version " VERSION;
static char title[BUFSIZE];
- if (strncmp(title, tmp, BUFSIZE)) {
- g_strlcpy(title, tmp, BUFSIZE);
- set_xterm_title("%s", title);
+ if (strncmp(title, new_title, BUFSIZE)) {
+ g_strlcpy(title, new_title, BUFSIZE);
+ set_xterm_title(title);
}
}
#endif
mpd->events = 0;
}
-static char *
-settings_name(const struct mpd_settings *settings)
-{
- const char *host = mpd_settings_get_host(settings);
- if (host == NULL)
- host = _("unknown");
-
- if (host[0] == '/')
- return g_strdup(host);
-
- unsigned port = mpd_settings_get_port(settings);
- if (port == 0 || port == 6600)
- return g_strdup(host);
-
- return g_strdup_printf("%s:%u", host, port);
-}
-
-static char *
-default_settings_name(void)
-{
- struct mpd_settings *settings =
- mpd_settings_new(options.host, options.port, 0,
- NULL, options.password);
- if (settings == NULL)
- return g_strdup(_("unknown"));
-
- char *name = settings_name(settings);
- mpd_settings_free(settings);
-
- return name;
-}
-
/**
* This timer is installed when the connection to the MPD server is
* broken. It tries to recover by reconnecting periodically.
reconnect_source_id = 0;
- char *name = default_settings_name();
+ char *name = mpdclient_settings_name(mpd);
screen_status_printf(_("Connecting to %s... [Press %s to abort]"),
name, get_key_names(CMD_QUIT, false));
g_free(name);
doupdate();
/* try again after 30 seconds */
- reconnect_source_id = g_timeout_add(30000,
- timer_reconnect, NULL);
+ reconnect_source_id =
+ g_timeout_add_seconds(30, timer_reconnect, NULL);
return;
}
#endif
assert(reconnect_source_id == 0);
/* try again in 5 seconds */
- reconnect_source_id = g_timeout_add(5000,
- timer_reconnect, NULL);
+ reconnect_source_id = g_timeout_add_seconds(5, timer_reconnect, NULL);
}
void
screen_update(mpd);
- reconnect_source_id = g_timeout_add(1000, timer_reconnect, NULL);
+ reconnect_source_id = g_timeout_add_seconds(1, timer_reconnect, NULL);
}
/**
auto_update_timer();
#ifndef NCMPC_MINI
- check_key_bindings_source_id = g_timeout_add(10000, timer_check_key_bindings, NULL);
+ check_key_bindings_source_id =
+ g_timeout_add_seconds(10, timer_check_key_bindings, NULL);
#endif
- screen_paint(mpd);
+ screen_paint(mpd, true);
g_main_loop_run(main_loop);
g_main_loop_unref(main_loop);