![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/main.c b/src/main.c
index c80b7ea1fe3f0a0fc26eb082589645c0a5ae3587..6010482a45a45dc58ac28a703ceac5036ef4a5a5 100644 (file)
--- a/src/main.c
+++ b/src/main.c
#include "screen_utils.h"
#include "strfsong.h"
#include "i18n.h"
+#include "player_command.h"
#ifndef NCMPC_MINI
#include "conf.h"
#include "lirc.h"
#endif
+#include <mpd/client.h>
+
#include <stdlib.h>
#include <unistd.h>
#include <signal.h>
#define BUFSIZE 1024
-static const guint idle_interval = 500;
-
-static mpdclient_t *mpd = NULL;
-static gboolean connected = FALSE;
+static struct mpdclient *mpd = NULL;
static GMainLoop *main_loop;
-static guint reconnect_source_id, idle_source_id, update_source_id;
-
-static const gchar *
-error_msg(const gchar *msg)
-{
- gchar *p;
-
- if ((p = strchr(msg, '}')) == NULL)
- return msg;
+static guint reconnect_source_id, update_source_id;
- do {
- p++;
- } while (*p == '}' || * p== ' ');
-
- return p;
-}
+#ifndef NCMPC_MINI
+static guint check_key_bindings_source_id;
+#endif
static void
-error_callback(G_GNUC_UNUSED mpdclient_t *c, gint error, const gchar *_msg)
+error_callback(G_GNUC_UNUSED struct mpdclient *c, G_GNUC_UNUSED gint error,
+ const gchar *_msg)
{
char *msg = utf8_to_locale(_msg);
-
- error = error & 0xFF;
- switch (error) {
- case MPD_ERROR_CONNPORT:
- case MPD_ERROR_NORESPONSE:
- break;
- case MPD_ERROR_ACK:
- screen_status_printf("%s", error_msg(msg));
- screen_bell();
- break;
- default:
- screen_status_printf("%s", msg);
- screen_bell();
- doupdate();
- connected = FALSE;
- }
-
+ screen_status_printf("%s", msg);
g_free(msg);
+
+ screen_bell();
+ doupdate();
}
#ifndef NCMPC_MINI
{
static char title[BUFSIZE];
char tmp[BUFSIZE];
- mpd_Status *status = NULL;
- mpd_Song *song = NULL;
+ struct mpd_status *status = NULL;
+ const struct mpd_song *song = NULL;
if (mpd) {
status = mpd->status;
}
if (options.xterm_title_format && status && song &&
- IS_PLAYING(status->state))
+ IS_PLAYING(mpd_status_get_state(status)))
strfsong(tmp, BUFSIZE, options.xterm_title_format, song);
else
g_strlcpy(tmp, PACKAGE " version " VERSION, BUFSIZE);
mpdclient_disconnect(mpd);
mpdclient_free(mpd);
}
-
- g_free(options.host);
- g_free(options.password);
- g_free(options.list_format);
- g_free(options.status_format);
-#ifndef NCMPC_MINI
- g_free(options.scroll_sep);
-#endif
}
static void
{
int ret;
- if (connected)
- return FALSE;
+ assert(!mpdclient_is_connected(mpd));
screen_status_printf(_("Connecting to %s... [Press %s to abort]"),
options.host, get_key_names(CMD_QUIT,0) );
#ifndef NCMPC_MINI
/* quit if mpd is pre 0.11.0 - song id not supported by mpd */
- if (MPD_VERSION_LT(mpd, 0, 11, 0)) {
+ if (mpd_connection_cmp_server_version(mpd->connection, 0, 12, 0) < 0) {
+ const unsigned *version =
+ mpd_connection_get_server_version(mpd->connection);
screen_status_printf(_("Error: MPD version %d.%d.%d is to old (%s needed)"),
- mpd->connection->version[0],
- mpd->connection->version[1],
- mpd->connection->version[2],
- "0.11.0");
+ version[0], version[1], version[2],
+ "0.12.0");
mpdclient_disconnect(mpd);
doupdate();
}
#endif
- screen_status_printf(_("Connected to %s"), options.host);
+ screen_status_printf(_("Connected to %s"),
+ options.host != NULL
+ ? options.host : "localhost");
doupdate();
- connected = TRUE;
-
/* update immediately */
g_timeout_add(1, timer_mpd_update, GINT_TO_POINTER(FALSE));
static gboolean
timer_mpd_update(gpointer data)
{
- if (connected)
+ if (mpdclient_is_connected(mpd))
mpdclient_update(mpd);
else if (reconnect_source_id == 0)
reconnect_source_id = g_timeout_add(1000, timer_reconnect,
return GPOINTER_TO_INT(data);
}
-/**
- * This idle timer is invoked when the user hasn't typed a key for
- * 500ms. It is used for delayed seeking.
- */
-static gboolean
-timer_idle(G_GNUC_UNUSED gpointer data)
-{
- screen_idle(mpd);
- return TRUE;
-}
-
void begin_input_event(void)
{
- /* remove the idle timeout; add it later with fresh interval */
- g_source_remove(idle_source_id);
}
void end_input_event(void)
{
screen_update(mpd);
-
- idle_source_id = g_timeout_add(idle_interval, timer_idle, NULL);
}
int do_input_event(command_t cmd)
gboolean key_error;
key_error = check_key_bindings(NULL, buf, sizeof(buf));
- if (!key_error)
+ if (!key_error) {
/* no error: disable this timer for the rest of this
process */
+ check_key_bindings_source_id = 0;
return FALSE;
+ }
#ifdef ENABLE_KEYDEF_SCREEN
g_strchomp(buf);
timer_mpd_update,
GINT_TO_POINTER(TRUE));
#ifndef NCMPC_MINI
- g_timeout_add(10000, timer_check_key_bindings, NULL);
+ check_key_bindings_source_id = g_timeout_add(10000, timer_check_key_bindings, NULL);
#endif
- idle_source_id = g_timeout_add(idle_interval, timer_idle, NULL);
screen_paint(mpd);
/* cleanup */
+ cancel_seek_timer();
+
+ g_source_remove(update_source_id);
+
+#ifndef NCMPC_MINI
+ if (check_key_bindings_source_id != 0)
+ g_source_remove(check_key_bindings_source_id);
+#endif
+
g_main_loop_unref(main_loop);
g_io_channel_unref(keyboard_channel);
#endif
ncu_deinit();
+ options_deinit();
return 0;
}