![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/main.c b/src/main.c
index 49c813a7a49d83523b3b5012a14aee3b46136fca..26ab45896b9f36fc408f0f8a24f44e1c52854c0d 100644 (file)
--- a/src/main.c
+++ b/src/main.c
#include "mpdclient.h"
#include "charset.h"
#include "options.h"
-#include "conf.h"
#include "command.h"
#include "ncu.h"
#include "screen.h"
#include "i18n.h"
#include "gcc.h"
+#ifndef NCMPC_MINI
+#include "conf.h"
+#endif
+
#ifdef ENABLE_LYRICS_SCREEN
#include "lyrics.h"
#endif
if ((p = strchr(msg, '}')) == NULL)
return msg;
- while (p && *p && (*p=='}' || *p==' '))
+ do {
p++;
+ } while (*p == '}' || * p== ' ');
return p;
}
static void
-error_callback(mpd_unused mpdclient_t *c, gint error, const gchar *msg)
+error_callback(mpd_unused mpdclient_t *c, gint error, const gchar *_msg)
{
+ char *msg = utf8_to_locale(_msg);
+
error = error & 0xFF;
switch (error) {
case MPD_ERROR_CONNPORT:
doupdate();
connected = FALSE;
}
+
+ g_free(msg);
}
+#ifndef NCMPC_MINI
static void
update_xterm_title(void)
{
set_xterm_title("%s", title);
}
}
+#endif
static void
exit_and_cleanup(void)
{
screen_exit();
+#ifndef NCMPC_MINI
set_xterm_title("");
+#endif
printf("\n");
if (mpd) {
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
return FALSE;
}
+#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)) {
screen_status_printf(_("Error: MPD version %d.%d.%d is to old (0.11.0 needed).\n"),
g_timeout_add(30000, timer_reconnect, NULL);
return FALSE;
}
+#endif
screen_status_printf(_("Connected to %s!"), options.host);
doupdate();
reconnect_source_id = g_timeout_add(1000, timer_reconnect,
NULL);
+#ifndef NCMPC_MINI
if (options.enable_xterm_title)
update_xterm_title();
+#endif
screen_update(mpd);
return TRUE;
}
-static gboolean
-keyboard_event(mpd_unused GIOChannel *source,
- mpd_unused GIOCondition condition, mpd_unused gpointer data)
+void begin_input_event(void)
{
- command_t cmd;
-
/* remove the idle timeout; add it later with fresh interval */
g_source_remove(idle_source_id);
+}
- if ((cmd=get_keyboard_command()) != CMD_NONE) {
- if (cmd == CMD_QUIT) {
- g_main_loop_quit(main_loop);
- return FALSE;
- }
+void end_input_event(void)
+{
+ screen_update(mpd);
- screen_cmd(mpd, cmd);
+ idle_source_id = g_timeout_add(idle_interval, timer_idle, NULL);
+}
- if (cmd == CMD_VOLUME_UP || cmd == CMD_VOLUME_DOWN) {
- /* make sure we dont update the volume yet */
- g_source_remove(update_source_id);
- update_source_id = g_timeout_add(update_interval,
- timer_mpd_update,
- GINT_TO_POINTER(TRUE));
- }
+int do_input_event(command_t cmd)
+{
+ if (cmd == CMD_QUIT) {
+ g_main_loop_quit(main_loop);
+ return -1;
}
- screen_update(mpd);
+ screen_cmd(mpd, cmd);
- idle_source_id = g_timeout_add(idle_interval, timer_idle, NULL);
- return TRUE;
+ if (cmd == CMD_VOLUME_UP || cmd == CMD_VOLUME_DOWN) {
+ /* make sure we dont update the volume yet */
+ g_source_remove(update_source_id);
+ update_source_id = g_timeout_add(update_interval,
+ timer_mpd_update,
+ GINT_TO_POINTER(TRUE));
+ }
+
+ return 0;
}
-#ifdef ENABLE_LIRC
static gboolean
-lirc_event(mpd_unused GIOChannel *source,
- mpd_unused GIOCondition condition, mpd_unused gpointer data)
+keyboard_event(mpd_unused GIOChannel *source,
+ mpd_unused GIOCondition condition, mpd_unused gpointer data)
{
command_t cmd;
- /* remove the idle timeout; add it later with fresh interval */
- g_source_remove(idle_source_id);
+ begin_input_event();
- if ((cmd = ncmpc_lirc_get_command()) != CMD_NONE) {
- if (cmd == CMD_QUIT) {
- g_main_loop_quit(main_loop);
+ if ((cmd=get_keyboard_command()) != CMD_NONE)
+ if (do_input_event(cmd) != 0)
return FALSE;
- }
-
- screen_cmd(mpd, cmd);
-
- if (cmd == CMD_VOLUME_UP || cmd == CMD_VOLUME_DOWN) {
- /* make sure we dont update the volume yet */
- g_source_remove(update_source_id);
- update_source_id = g_timeout_add(update_interval,
- timer_mpd_update,
- GINT_TO_POINTER(TRUE));
- }
- }
-
- screen_update(mpd);
- idle_source_id = g_timeout_add(idle_interval, timer_idle, NULL);
+ end_input_event();
return TRUE;
}
-#endif
+#ifndef NCMPC_MINI
/**
* Check the configured key bindings for errors, and display a status
* message every 10 seconds.
doupdate();
return TRUE;
}
+#endif
int
main(int argc, const char *argv[])
{
struct sigaction act;
-#ifdef HAVE_LOCALE_H
+#if defined(HAVE_LOCALE_H) && !defined(NCMPC_MINI)
const char *charset = NULL;
#endif
GIOChannel *keyboard_channel;
GIOChannel *lirc_channel = NULL;
#endif
-#ifdef HAVE_LOCALE_H
+#if defined(HAVE_LOCALE_H) && !defined(NCMPC_MINI)
/* time and date formatting */
setlocale(LC_TIME,"");
/* care about sorting order etc */
options_parse(argc, argv);
/* read configuration */
+#ifndef NCMPC_MINI
read_configuration();
+#endif
/* check key bindings */
check_key_bindings(NULL, NULL, 0);
update_source_id = g_timeout_add(update_interval,
timer_mpd_update,
GINT_TO_POINTER(TRUE));
+#ifndef NCMPC_MINI
g_timeout_add(10000, timer_check_key_bindings, NULL);
+#endif
idle_source_id = g_timeout_add(idle_interval, timer_idle, NULL);
screen_paint(mpd);