![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/main.c b/src/main.c
index 1581e78875658f50fd487015c2cc566fd248d435..fe21c6bcf6c947605c8af89a6c581bd5b2759457 100644 (file)
--- a/src/main.c
+++ b/src/main.c
/* ncmpc (Ncurses MPD Client)
- * (c) 2004-2010 The Music Player Daemon Project
+ * (c) 2004-2017 The Music Player Daemon Project
* Project homepage: http://musicpd.org
*
* This program is free software; you can redistribute it and/or modify
#include "config.h"
#include "ncmpc.h"
#include "mpdclient.h"
-#include "gidle.h"
+#include "callbacks.h"
#include "charset.h"
#include "options.h"
#include "command.h"
static void
update_xterm_title(void)
{
- static char title[BUFSIZE];
- char tmp[BUFSIZE];
struct mpd_status *status = NULL;
const struct mpd_song *song = NULL;
-
if (mpd) {
status = mpd->status;
song = mpd->song;
}
+ char tmp[BUFSIZE];
if (options.xterm_title_format && status && song &&
mpd_status_get_state(status) == MPD_STATE_PLAY)
strfsong(tmp, BUFSIZE, options.xterm_title_format, song);
else
g_strlcpy(tmp, PACKAGE " version " VERSION, BUFSIZE);
+ static char title[BUFSIZE];
if (strncmp(title, tmp, BUFSIZE)) {
g_strlcpy(title, tmp, BUFSIZE);
set_xterm_title("%s", title);
printf("\n");
if (mpd) {
- mpdclient_disconnect(mpd);
mpdclient_free(mpd);
}
}
#ifndef WIN32
static void
-catch_sigint(G_GNUC_UNUSED int sig)
+catch_sigint(gcc_unused int sig)
{
g_main_loop_quit(main_loop);
}
static void
-catch_sigcont(G_GNUC_UNUSED int sig)
+catch_sigcont(gcc_unused int sig)
{
char irrelevant = 'a';
if (1 != write(sigwinch_pipes[1], &irrelevant, 1))
}
static gboolean
-sigwinch_event(G_GNUC_UNUSED GIOChannel *source,
- G_GNUC_UNUSED GIOCondition condition, G_GNUC_UNUSED gpointer data)
+sigwinch_event(gcc_unused GIOChannel *source,
+ gcc_unused GIOCondition condition, gcc_unused gpointer data)
{
char ignoreme[64];
if (1 > read(sigwinch_pipes[0], ignoreme, 64))
}
static void
-catch_sigwinch(G_GNUC_UNUSED int sig)
+catch_sigwinch(gcc_unused int sig)
{
- char irrelevant = 'a';
- if (1 != write(sigwinch_pipes[1], &irrelevant, 1))
+ if (1 != write(sigwinch_pipes[1], "", 1))
exit(EXIT_FAILURE);
}
#endif /* WIN32 */
-static void
-idle_callback(enum mpd_error error,
- G_GNUC_UNUSED enum mpd_server_error server_error,
- const char *message, enum mpd_idle events,
- G_GNUC_UNUSED void *ctx);
-
static gboolean
timer_mpd_update(gpointer data);
should_enable_update_timer(void)
{
return (mpdclient_is_connected(mpd) &&
- (mpd->source == NULL || /* "idle" not supported */
- (mpd->status != NULL &&
- mpd_status_get_state(mpd->status) == MPD_STATE_PLAY)))
+ mpd->status != NULL &&
+ mpd_status_get_state(mpd->status) == MPD_STATE_PLAY)
#ifndef NCMPC_MINI
|| options.display_time
#endif
do_mpd_update(void)
{
if (mpdclient_is_connected(mpd) &&
- (mpd->source == NULL || mpd->events != 0 ||
+ (mpd->events != 0 ||
(mpd->status != NULL &&
mpd_status_get_state(mpd->status) == MPD_STATE_PLAY)))
mpdclient_update(mpd);
check_reconnect();
}
-#if LIBMPDCLIENT_CHECK_VERSION(2,4,0)
-
static char *
settings_name(const struct mpd_settings *settings)
{
return g_strdup_printf("%s:%u", host, port);
}
-#endif
-
static char *
default_settings_name(void)
{
-#if LIBMPDCLIENT_CHECK_VERSION(2,4,0)
struct mpd_settings *settings =
mpd_settings_new(options.host, options.port, 0,
NULL, options.password);
mpd_settings_free(settings);
return name;
-#else
- /*
- * 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
-}
-
-static char *
-connection_settings_name(const struct mpd_connection *connection)
-{
-#if LIBMPDCLIENT_CHECK_VERSION(2,4,0)
- const struct mpd_settings *settings =
- mpd_connection_get_settings(connection);
- if (settings == NULL)
- return g_strdup(_("unknown"));
-
- return settings_name(settings);
-#else
- (void)connection;
-
- return default_settings_name();
-#endif
}
/**
* broken. It tries to recover by reconnecting periodically.
*/
static gboolean
-timer_reconnect(G_GNUC_UNUSED gpointer data)
+timer_reconnect(gcc_unused gpointer data)
{
- bool success;
- struct mpd_connection *connection;
-
assert(!mpdclient_is_connected(mpd));
reconnect_source_id = 0;
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,
- options.timeout_ms,
- options.password);
- if (!success) {
+ if (!mpdclient_connect(mpd, options.host, options.port,
+ options.timeout_ms,
+ options.password)) {
/* try again in 5 seconds */
reconnect_source_id = g_timeout_add(5000,
timer_reconnect, NULL);
return FALSE;
}
- 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 */
+ struct mpd_connection *connection = mpdclient_get_connection(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)"),
+ screen_status_printf(_("Error: MPD version %d.%d.%d is too old (%s needed)"),
version[0], version[1], version[2],
- "0.12.0");
+ "0.16.0");
mpdclient_disconnect(mpd);
doupdate();
}
#endif
- if (mpd_connection_cmp_server_version(connection,
- 0, 14, 0) >= 0)
- mpd->source = mpd_glib_new(connection,
- idle_callback, mpd);
-
- name = connection_settings_name(connection);
- screen_status_printf(_("Connected to %s"), name);
- g_free(name);
+ screen_status_clear_message();
doupdate();
/* update immediately */
NULL);
}
+void
+mpdclient_lost_callback(void)
+{
+ assert(reconnect_source_id == 0);
+
+ screen_update(mpd);
+
+ reconnect_source_id = g_timeout_add(1000, timer_reconnect, NULL);
+}
+
/**
* This function is called by the gidle.c library when MPD sends us an
* idle event (or when the connection dies).
*/
-static void
-idle_callback(enum mpd_error error, enum mpd_server_error server_error,
- const char *message, enum mpd_idle events,
- void *ctx)
+void
+mpdclient_idle_callback(gcc_unused enum mpd_idle events)
{
- struct mpdclient *c = ctx;
-
- c->idle = false;
-
- assert(mpdclient_is_connected(c));
-
- if (error != MPD_ERROR_SUCCESS) {
- char *allocated;
-
- if (error == MPD_ERROR_SERVER &&
- server_error == MPD_SERVER_ERROR_UNKNOWN_CMD) {
- /* the "idle" command is not supported - fall
- back to timer based polling */
- mpd_glib_free(c->source);
- c->source = NULL;
- auto_update_timer();
- return;
- }
-
- if (error == MPD_ERROR_SERVER)
- message = allocated = utf8_to_locale(message);
- else
- allocated = NULL;
- screen_status_message(message);
- g_free(allocated);
- screen_bell();
- doupdate();
-
- mpdclient_disconnect(c);
- screen_update(mpd);
- reconnect_source_id = g_timeout_add(1000, timer_reconnect,
- NULL);
- return;
- }
-
- c->events |= events;
- mpdclient_update(c);
-
#ifndef NCMPC_MINI
if (options.enable_xterm_title)
update_xterm_title();
#endif
screen_update(mpd);
- c->events = 0;
-
- mpdclient_put_connection(c);
- check_reconnect();
auto_update_timer();
}
static gboolean
-timer_mpd_update(G_GNUC_UNUSED gpointer data)
+timer_mpd_update(gcc_unused gpointer data)
{
do_mpd_update();
}
static gboolean
-keyboard_event(G_GNUC_UNUSED GIOChannel *source,
- G_GNUC_UNUSED GIOCondition condition,
- G_GNUC_UNUSED gpointer data)
+keyboard_event(gcc_unused GIOChannel *source,
+ gcc_unused GIOCondition condition,
+ gcc_unused gpointer data)
{
- command_t cmd;
-
begin_input_event();
- if ((cmd=get_keyboard_command()) != CMD_NONE)
+ command_t cmd = get_keyboard_command();
+ if (cmd != CMD_NONE)
if (do_input_event(cmd) != 0)
return FALSE;
* message every 10 seconds.
*/
static gboolean
-timer_check_key_bindings(G_GNUC_UNUSED gpointer data)
+timer_check_key_bindings(gcc_unused gpointer data)
{
char buf[256];
-#ifdef ENABLE_KEYDEF_SCREEN
- char comment[64];
-#endif
- gboolean key_error;
- key_error = check_key_bindings(NULL, buf, sizeof(buf));
- if (!key_error) {
+ if (check_key_bindings(NULL, buf, sizeof(buf))) {
/* no error: disable this timer for the rest of this
process */
check_key_bindings_source_id = 0;
/* to translators: a key was bound twice in the key editor,
and this is a hint for the user what to press to correct
that */
+ char comment[64];
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
+ gcc_unused
#endif
const char *charset = NULL;
-#endif
- GIOChannel *keyboard_channel;
-#ifdef ENABLE_LIRC
- int lirc_socket;
- GIOChannel *lirc_channel = NULL;
-#endif
- GIOChannel *sigwinch_channel = NULL;
-
-#ifdef ENABLE_LOCALE
/* time and date formatting */
setlocale(LC_TIME,"");
/* care about sorting order etc */
#ifndef WIN32
/* setup signal behavior - SIGINT */
+ struct sigaction act;
sigemptyset(&act.sa_mask);
act.sa_flags = 0;
act.sa_handler = catch_sigint;
main_loop = g_main_loop_new(NULL, FALSE);
/* watch out for keyboard input */
- keyboard_channel = g_io_channel_unix_new(STDIN_FILENO);
+ GIOChannel *keyboard_channel = g_io_channel_unix_new(STDIN_FILENO);
g_io_add_watch(keyboard_channel, G_IO_IN, keyboard_event, NULL);
#ifdef ENABLE_LIRC
/* watch out for lirc input */
- lirc_socket = ncmpc_lirc_open();
+ int lirc_socket = ncmpc_lirc_open();
+ GIOChannel *lirc_channel = NULL;
if (lirc_socket >= 0) {
lirc_channel = g_io_channel_unix_new(lirc_socket);
g_io_add_watch(lirc_channel, G_IO_IN, lirc_event, NULL);
#endif
#ifndef WIN32
+ GIOChannel *sigwinch_channel = NULL;
if (!pipe(sigwinch_pipes) &&
!fcntl(sigwinch_pipes[1], F_SETFL, O_NONBLOCK)) {
sigwinch_channel = g_io_channel_unix_new(sigwinch_pipes[0]);