diff --git a/src/main.c b/src/main.c
index a57f35dfcf27f610fe44972828b23af34b3c76f1..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"
#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"
}
}
+#ifndef WIN32
static void
catch_sigint(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,
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 */
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();
c->idle = false;
- assert(mpdclient_get_connection(c) != NULL);
+ assert(mpdclient_is_connected(c));
if (error != MPD_ERROR_SUCCESS) {
char *allocated;
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
int
main(int argc, const char *argv[])
{
+#ifndef WIN32
struct sigaction act;
+#endif
#ifdef ENABLE_LOCALE
#ifndef ENABLE_NLS
G_GNUC_UNUSED
/* parse command line options - 2 pass */
options_parse(argc, argv);
+#ifndef WIN32
/* setup signal behavior - SIGINT */
sigemptyset(&act.sa_mask);
act.sa_flags = 0;
perror("sigaction(SIGPIPE)");
exit(EXIT_FAILURE);
}
+#endif
ncu_init();
}
#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]);
perror("sigwinch pipe creation failed");
exit(EXIT_FAILURE);
}
+#endif
/* attempt to connect */
reconnect_source_id = g_timeout_add(1, timer_reconnect, NULL);