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

28
src/server_info.cpp
View File

@@ -85,7 +85,7 @@ void ServerInfo::Resize()
hasToBeResized = 0;
}
std::basic_string<my_char_t> ServerInfo::Title()
std::wstring ServerInfo::Title()
{
return myOldScreen->Title();
}
@@ -103,28 +103,28 @@ void ServerInfo::Update()
w->clear();
*w << NC::fmtBold << U("Version: ") << NC::fmtBoldEnd << U("0.") << Mpd.Version() << U(".*\n");
*w << NC::fmtBold << U("Uptime: ") << NC::fmtBoldEnd;
*w << NC::fmtBold << L"Version: " << NC::fmtBoldEnd << L"0." << Mpd.Version() << L".*\n";
*w << NC::fmtBold << L"Uptime: " << NC::fmtBoldEnd;
ShowTime(*w, stats.uptime(), 1);
*w << '\n';
*w << NC::fmtBold << U("Time playing: ") << NC::fmtBoldEnd << MPD::Song::ShowTime(stats.playTime()) << '\n';
*w << NC::fmtBold << L"Time playing: " << NC::fmtBoldEnd << MPD::Song::ShowTime(stats.playTime()) << '\n';
*w << '\n';
*w << NC::fmtBold << U("Total playtime: ") << NC::fmtBoldEnd;
*w << NC::fmtBold << L"Total playtime: " << NC::fmtBoldEnd;
ShowTime(*w, stats.dbPlayTime(), 1);
*w << '\n';
*w << NC::fmtBold << U("Artist names: ") << NC::fmtBoldEnd << stats.artists() << '\n';
*w << NC::fmtBold << U("Album names: ") << NC::fmtBoldEnd << stats.albums() << '\n';
*w << NC::fmtBold << U("Songs in database: ") << NC::fmtBoldEnd << stats.songs() << '\n';
*w << NC::fmtBold << L"Artist names: " << NC::fmtBoldEnd << stats.artists() << '\n';
*w << NC::fmtBold << L"Album names: " << NC::fmtBoldEnd << stats.albums() << '\n';
*w << NC::fmtBold << L"Songs in database: " << NC::fmtBoldEnd << stats.songs() << '\n';
*w << '\n';
*w << NC::fmtBold << U("Last DB update: ") << NC::fmtBoldEnd << Timestamp(stats.dbUpdateTime()) << '\n';
*w << NC::fmtBold << L"Last DB update: " << NC::fmtBoldEnd << Timestamp(stats.dbUpdateTime()) << '\n';
*w << '\n';
*w << NC::fmtBold << U("URL Handlers:") << NC::fmtBoldEnd;
*w << NC::fmtBold << L"URL Handlers:" << NC::fmtBoldEnd;
for (auto it = itsURLHandlers.begin(); it != itsURLHandlers.end(); ++it)
*w << (it != itsURLHandlers.begin() ? U(", ") : U(" ")) << *it;
*w << U("\n\n");
*w << NC::fmtBold << U("Tag Types:") << NC::fmtBoldEnd;
*w << (it != itsURLHandlers.begin() ? L", " : L" ") << *it;
*w << L"\n\n";
*w << NC::fmtBold << L"Tag Types:" << NC::fmtBoldEnd;
for (auto it = itsTagTypes.begin(); it != itsTagTypes.end(); ++it)
*w << (it != itsTagTypes.begin() ? U(", ") : U(" ")) << *it;
*w << (it != itsTagTypes.begin() ? L", " : L" ") << *it;
w->flush();
w->refresh();