X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Ftitle_bar.c;h=9b2c12a5456ca36e35a56a4778e7c4025f1c48e1;hb=386ea7f72f2e08d037111bdb6272d91e7bba6ef3;hp=e83156519a4890ef2a10c13248638ecdcba00b04;hpb=abf74f74fc864c9dc2a928d72d9172eb9742e6aa;p=ncmpc.git

diff --git a/src/title_bar.c b/src/title_bar.c
index e831565..9b2c12a 100644
--- 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
@@ -59,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);
 
@@ -76,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"));
@@ -96,7 +93,8 @@ title_bar_paint(const struct title_bar *p, const char *title,
 #endif
 	}
 
-	volume = get_volume(status);
+	int volume = get_volume(status);
+	char buf[32];
 	if (volume < 0)
 		g_snprintf(buf, 32, _("Volume n/a"));
 	else
@@ -105,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))
@@ -126,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, ']');