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

use wstrings uncoditionally where needed

Browse Source
This commit is contained in:
Andrzej Rybczak
2012-09-08 17:50:01 +02:00
parent cf06d9fa8d
commit d5e2d315fd
46 changed files with 196 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/song.cpp
View File

@@ -39,16 +39,16 @@ size_t calc_hash(const char* s, unsigned seed = 0)
}
// temporary hack, it won't work properly with wide characters
std::string Shorten(const std::basic_string<my_char_t> &s, size_t max_length)
std::string Shorten(const std::wstring &s, size_t max_length)
{
if (s.length() <= max_length)
return TO_STRING(s);
return ToString(s);
if (max_length < 2)
return "";
std::basic_string<my_char_t> result(s, 0, max_length/2-!(max_length%2));
result += U("..");
std::wstring result(s, 0, max_length/2-!(max_length%2));
result += L"..";
result += s.substr(s.length()-max_length/2+1);
return TO_STRING(result);
return ToString(result);
}
}
@@ -373,7 +373,7 @@ std::string Song::ParseFormat(std::string::const_iterator &it, const std::string
{
if (delimiter)
{
const std::basic_string<my_char_t> &s = TO_WSTRING(tag);
std::wstring s = ToWString(tag);
if (NC::Window::length(s) > delimiter)
tag = Shorten(s, delimiter);
}