meson_options.txt: add missing default values

[ncmpc.git] / src / title_bar.c

diff --git a/src/title_bar.c b/src/title_bar.c
index f45b05f0cff8fcff908eb2a11b89348fdf711ac3..9b2c12a5456ca36e35a56a4778e7c4025f1c48e1 100644 (file)
--- a/src/title_bar.c
+++ b/src/title_bar.c
@@ -1,5 +1,5 @@
 /* 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
@@ -23,6 +23,8 @@
 #include "i18n.h"
 #include "charset.h"
 
+#include "config.h"
+
 #include <mpd/client.h>
 
 #include <glib.h>
@@ -35,7 +37,7 @@ static void
 print_hotkey(WINDOW *w, command_t cmd, const char *label)
 {
        colors_use(w, COLOR_TITLE_BOLD);
-       waddstr(w, get_key_names(cmd, FALSE));
+       waddstr(w, get_key_names(cmd, false));
        colors_use(w, COLOR_TITLE);
        waddch(w, ':');
        waddstr(w, label);
@@ -57,9 +59,6 @@ title_bar_paint(const struct title_bar *p, const char *title,
                const struct mpd_status *status)
 {
        WINDOW *w = p->window.w;
-       int volume;
-       char flags[5];
-       char buf[32];
 
        assert(p != NULL);
 
@@ -74,7 +73,7 @@ title_bar_paint(const struct title_bar *p, const char *title,
 #ifdef ENABLE_HELP_SCREEN
                print_hotkey(w, CMD_SCREEN_HELP, _("Help"));
 #endif
-               print_hotkey(w, CMD_SCREEN_PLAY, _("Playlist"));
+               print_hotkey(w, CMD_SCREEN_PLAY, _("Queue"));
                print_hotkey(w, CMD_SCREEN_FILE, _("Browse"));
 #ifdef ENABLE_ARTIST_SCREEN
                print_hotkey(w, CMD_SCREEN_ARTIST, _("Artist"));
@@ -88,10 +87,14 @@ title_bar_paint(const struct title_bar *p, const char *title,
 #ifdef ENABLE_OUTPUTS_SCREEN
                print_hotkey(w, CMD_SCREEN_OUTPUTS, _("Outputs"));
 #endif
+#ifdef ENABLE_CHAT_SCREEN
+               print_hotkey(w, CMD_SCREEN_CHAT, _("Chat"));
+#endif
 #endif
        }
 
-       volume = get_volume(status);
+       int volume = get_volume(status);
+       char buf[32];
        if (volume < 0)
                g_snprintf(buf, 32, _("Volume n/a"));
        else
@@ -100,6 +103,7 @@ title_bar_paint(const struct title_bar *p, const char *title,
        colors_use(w, COLOR_TITLE);
        mvwaddstr(w, 0, p->window.cols - utf8_width(buf), buf);
 
+       char flags[5];
        flags[0] = 0;
        if (status != NULL) {
                if (mpd_status_get_repeat(status))
@@ -121,7 +125,7 @@ title_bar_paint(const struct title_bar *p, const char *title,
        if (flags[0]) {
                wmove(w, 1, p->window.cols - strlen(flags) - 3);
                waddch(w, '[');
-               colors_use(w, COLOR_LINE_BOLD);
+               colors_use(w, COLOR_LINE_FLAGS);
                waddstr(w, flags);
                colors_use(w, COLOR_LINE);
                waddch(w, ']');