diff --git a/src/main.c b/src/main.c
index 60f5d21c92290b4193eae1e1c6fd649c2ebb2744..ffc310fcee2b183d862c77e9c2bf83f8166929df 100644 (file)
--- a/src/main.c
+++ b/src/main.c
* 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"
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
}
#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
}
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,
- 5000,
+ options.timeout_ms,
options.password);
if (!success) {
/* try again in 5 seconds */
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