Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andrzej Rybczak
2009-09-15 21:07:37 +00:00
parent b5a49b3fee
commit d6fbb2f657
5 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/browser.cpp
View File

@@ -88,7 +88,7 @@ void Browser::SwitchTo()
std::basic_string<my_char_t> Browser::Title() std::basic_string<my_char_t> Browser::Title()
{ {
std::basic_string<my_char_t> result = U("Browse: "); 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; return result;
} }

7
src/helpers.cpp
View File

@@ -332,13 +332,6 @@ std::string ExtractTopDirectory(const std::string &s)
return slash != std::string::npos ? s.substr(++slash) : 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> Scroller(const std::basic_string<my_char_t> &str, size_t &pos, size_t width)
{ {
std::basic_string<my_char_t> s(str); std::basic_string<my_char_t> s(str);

3
src/helpers.h
View File

@@ -155,9 +155,6 @@ std::string ExtractTopDirectory(const std::string &);
std::string GetLineValue(std::string &, char = '"', char = '"', bool = 0); 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); 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 #ifdef HAVE_CURL_CURL_H

2
src/lyrics.cpp
View File

@@ -191,7 +191,7 @@ void Lyrics::SwitchTo()
std::basic_string<my_char_t> Lyrics::Title() std::basic_string<my_char_t> Lyrics::Title()
{ {
std::basic_string<my_char_t> result = U("Lyrics: "); 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; return result;
} }

2
src/playlist.cpp
View File

@@ -132,7 +132,7 @@ std::basic_string<my_char_t> Playlist::Title()
std::basic_string<my_char_t> result = U("Playlist "); std::basic_string<my_char_t> result = U("Playlist ");
if (ReloadTotalLength || ReloadRemaining) if (ReloadTotalLength || ReloadRemaining)
itsBufferedStats = TotalLength(); 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; return result;
} }