remove wrapper for Scroller() needed with --enable-unicode

src/browser.cpp

@@ -88,7 +88,7 @@ void Browser::SwitchTo()
 std::basic_string<my_char_t> Browser::Title()
 {
 	std::basic_string<my_char_t> result = U("Browse: ");
-	result += Scroller(itsBrowsedDir, itsScrollBeginning, w->GetWidth()-result.length()-(Config.new_design ? 2 : VolumeState.length()));
+	result += Scroller(TO_WSTRING(itsBrowsedDir), itsScrollBeginning, w->GetWidth()-result.length()-(Config.new_design ? 2 : VolumeState.length()));
 	return result;
 }
 

src/helpers.cpp

@@ -332,13 +332,6 @@ std::string ExtractTopDirectory(const std::string &s)
 	return slash != std::string::npos ? s.substr(++slash) : s;
 }
 
-#ifdef _UTF8
-std::basic_string<my_char_t> Scroller(const std::string &str, size_t &pos, size_t width)
-{
-	return Scroller(TO_WSTRING(str), pos, width);
-}
-#endif // _UTF8
-
 std::basic_string<my_char_t> Scroller(const std::basic_string<my_char_t> &str, size_t &pos, size_t width)
 {
 	std::basic_string<my_char_t> s(str);

src/helpers.h

@@ -155,9 +155,6 @@ std::string ExtractTopDirectory(const std::string &);
 
 std::string GetLineValue(std::string &, char = '"', char = '"', bool = 0);
 
-#ifdef _UTF8
-std::basic_string<my_char_t> Scroller(const std::string &str, size_t &pos, size_t width);
-#endif // _UTF8
 std::basic_string<my_char_t> Scroller(const std::basic_string<my_char_t> &str, size_t &pos, size_t width);
 
 #ifdef HAVE_CURL_CURL_H

src/lyrics.cpp

@@ -191,7 +191,7 @@ void Lyrics::SwitchTo()
 std::basic_string<my_char_t> Lyrics::Title()
 {
 	std::basic_string<my_char_t> result = U("Lyrics: ");
-	result += Scroller(itsSong.toString("{%a - %t}"), itsScrollBegin, w->GetWidth()-result.length()-(Config.new_design ? 2 : VolumeState.length()));
+	result += Scroller(TO_WSTRING(itsSong.toString("{%a - %t}")), itsScrollBegin, w->GetWidth()-result.length()-(Config.new_design ? 2 : VolumeState.length()));
 	return result;
 }
 

src/playlist.cpp

@@ -132,7 +132,7 @@ std::basic_string<my_char_t> Playlist::Title()
 	std::basic_string<my_char_t> result = U("Playlist ");
 	if (ReloadTotalLength || ReloadRemaining)
 		itsBufferedStats = TotalLength();
-	result += Scroller(itsBufferedStats, itsScrollBegin, Items->GetWidth()-result.length()-(Config.new_design ? 2 : VolumeState.length()));
+	result += Scroller(TO_WSTRING(itsBufferedStats), itsScrollBegin, Items->GetWidth()-result.length()-(Config.new_design ? 2 : VolumeState.length()));
 	return result;
 }