From cecb11c3d83671296818cb74aa02de63cb04d4da Mon Sep 17 00:00:00 2001
From: Andrzej Rybczak <electricityispower@gmail.com>
Date: Wed, 11 Feb 2009 09:12:49 +0100
Subject: [PATCH] move WindowTitle() to local unnamed namespace

---
 src/helpers.cpp        | 51 ------------------------------------------
 src/helpers.h          |  4 ----
 src/lyrics.cpp         |  2 +-
 src/lyrics.h           |  4 ++--
 src/ncmpcpp.cpp        |  4 ++--
 src/status_checker.cpp | 30 ++++++++++++++++++-------
 6 files changed, 27 insertions(+), 68 deletions(-)

diff --git a/src/helpers.cpp b/src/helpers.cpp
index 31486ec5..96986d7c 100644
--- a/src/helpers.cpp
+++ b/src/helpers.cpp
@@ -39,8 +39,6 @@ extern NcmpcppScreen current_screen;
 extern bool search_case_sensitive;
 extern bool search_match_to_pattern;
 
-const string term_type = getenv("TERM") ? getenv("TERM") : "";
-
 namespace
 {
 	inline void remove_the_word(string &s)
@@ -260,55 +258,6 @@ bool SortSongsByTrack(Song *a, Song *b)
 		return StrToInt(a->GetDisc()) < StrToInt(b->GetDisc());
 }
 
-void WindowTitle(const string &status)
-{
-	if (term_type != "linux" && Config.set_window_title)
-		std::cout << "\033]0;" << status << "\7";
-}
-
-Window &operator<<(Window &w, mpd_TagItems tag)
-{
-	switch (tag)
-	{
-		case MPD_TAG_ITEM_ARTIST:
-			w << "Artist";
-			break;
-		case MPD_TAG_ITEM_ALBUM:
-			w << "Album";
-			break;
-		case MPD_TAG_ITEM_TITLE:
-			w << "Title";
-			break;
-		case MPD_TAG_ITEM_TRACK:
-			w << "Track";
-			break;
-		case MPD_TAG_ITEM_GENRE:
-			w << "Genre";
-			break;
-		case MPD_TAG_ITEM_DATE:
-			w << "Year";
-			break;
-		case MPD_TAG_ITEM_COMPOSER:
-			w << "Composer";
-			break;
-		case MPD_TAG_ITEM_PERFORMER:
-			w << "Performer";
-			break;
-		case MPD_TAG_ITEM_COMMENT:
-			w << "Comment";
-			break;
-		case MPD_TAG_ITEM_DISC:
-			w << "Disc";
-			break;
-		case MPD_TAG_ITEM_FILENAME:
-			w << "Filename";
-			break;
-		default:
-			break;
-	}
-	return w;
-}
-
 string FindSharedDir(const string &one, const string &two)
 {
 	if (one == two)
diff --git a/src/helpers.h b/src/helpers.h
index 6483e35d..5dfe531e 100644
--- a/src/helpers.h
+++ b/src/helpers.h
@@ -42,10 +42,6 @@ void UpdateSongList(Menu<MPD::Song> *);
 
 bool Keypressed(int, const int *);
 
-void WindowTitle(const std::string &);
-
-Window &operator<<(Window &, mpd_TagItems);
-
 std::string FindSharedDir(const std::string &, const std::string &);
 
 void GetInfo(MPD::Song &, Scrollpad &);
diff --git a/src/lyrics.cpp b/src/lyrics.cpp
index 5641ec18..aaac1e9f 100644
--- a/src/lyrics.cpp
+++ b/src/lyrics.cpp
@@ -103,7 +103,7 @@ namespace
 	}
 }
 
-void * GetArtistInfo(void *ptr)
+void *GetArtistInfo(void *ptr)
 {
 	string *strptr = static_cast<string *>(ptr);
 	string artist = *strptr;
diff --git a/src/lyrics.h b/src/lyrics.h
index da709112..c56375c7 100644
--- a/src/lyrics.h
+++ b/src/lyrics.h
@@ -26,7 +26,7 @@
 #ifdef HAVE_CURL_CURL_H
 # include <pthread.h>
 # include "curl/curl.h"
-void * GetArtistInfo(void *);
+void *GetArtistInfo(void *);
 
 struct LyricsPlugin
 {
@@ -40,7 +40,7 @@ const char *GetLyricsPluginName(int);
 
 #endif
 
-void * GetLyrics(void *);
+void *GetLyrics(void *);
 
 #endif
 
diff --git a/src/ncmpcpp.cpp b/src/ncmpcpp.cpp
index 7c18736e..91bd2be8 100644
--- a/src/ncmpcpp.cpp
+++ b/src/ncmpcpp.cpp
@@ -413,7 +413,7 @@ int main(int argc, char *argv[])
 		gettimeofday(&past, 0);
 		const size_t max_allowed_title_length = wHeader ? wHeader->GetWidth()-volume_state.length()-screen_title.length() : 0;
 		if (((past.tv_sec == now.tv_sec && past.tv_usec >= now.tv_usec+500000)
-		||    past.tv_sec >= now.tv_sec+1)
+		||    past.tv_sec > now.tv_sec)
 		&&  ((current_screen == csBrowser && browsed_dir.length() > max_allowed_title_length)
 		||    current_screen == csLyrics))
 		{
@@ -2658,7 +2658,7 @@ int main(int argc, char *argv[])
 			if (wCurrent == mLibArtists)
 			{
 				LockStatusbar();
-				Statusbar() << fmtBold << Config.media_lib_primary_tag << fmtBoldEnd << ": ";
+				Statusbar() << fmtBold << IntoStr(Config.media_lib_primary_tag) << fmtBoldEnd << ": ";
 				string new_tag = wFooter->GetString(mLibArtists->Current());
 				UnlockStatusbar();
 				if (!new_tag.empty() && new_tag != mLibArtists->Current())
diff --git a/src/status_checker.cpp b/src/status_checker.cpp
index b0b704b6..b4d44bd6 100644
--- a/src/status_checker.cpp
+++ b/src/status_checker.cpp
@@ -18,6 +18,7 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
+#include <iostream>
 #include <stdexcept>
 
 #include "browser.h"
@@ -65,17 +66,30 @@ extern bool messages_allowed;
 extern bool redraw_header;
 extern bool reload_lyrics;
 
-int old_playing;
-
-time_t time_of_statusbar_lock;
-
 string volume_state;
-string switch_state;
 
-bool block_statusbar_update = 0;
-bool allow_statusbar_unlock = 1;
 bool header_update_status = 0;
-bool repeat_one_allowed = 0;
+
+namespace
+{
+	time_t time_of_statusbar_lock;
+	
+	int old_playing;
+	
+	string switch_state;
+	
+	bool block_statusbar_update = 0;
+	bool allow_statusbar_unlock = 1;
+	bool repeat_one_allowed = 0;
+	
+	const string term_type = getenv("TERM") ? getenv("TERM") : "";
+	
+	void WindowTitle(const string &status)
+	{
+		if (term_type != "linux" && Config.set_window_title)
+			std::cout << "\033]0;" << status << "\7";
+	}
+}
 
 void LockStatusbar()
 {