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

status: minor interface changes

Browse Source
This commit is contained in:
Andrzej Rybczak
2014-12-13 18:44:38 +01:00
parent 7e87650715
commit 8657cdbf4d
1 changed files with 44 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/status.cpp
View File

@@ -88,25 +88,46 @@ std::string playerStateToString(MPD::PlayerState ps)
switch (ps) switch (ps)
{ {
case MPD::psUnknown: case MPD::psUnknown:
result = "[unknown]"; switch (Config.design)
{
case Design::Alternative:
result = "[unknown]";
break;
case Design::Classic:
break;
}
break; break;
case MPD::psPlay: case MPD::psPlay:
if (Config.design == Design::Alternative) switch (Config.design)
result = "[playing]"; {
else case Design::Alternative:
result = "Playing: "; result = "[playing]";
break;
case Design::Classic:
result = "Playing:";
break;
}
break; break;
case MPD::psPause: case MPD::psPause:
if (Config.design == Design::Alternative) switch (Config.design)
result = "[paused] "; {
else case Design::Alternative:
result = "[Paused] "; result = "[paused]";
break;
case Design::Classic:
result = "Paused:";
break;
}
break; break;
case MPD::psStop: case MPD::psStop:
if (Config.design == Design::Alternative) switch (Config.design)
result = "[stopped]"; {
break; case Design::Alternative:
default: result = "[stopped]";
break;
case Design::Classic:
break;
}
break; break;
} }
return result; return result;
@@ -568,11 +589,11 @@ void Status::Changes::elapsedTime(bool update_elapsed)
{ {
if (Config.display_bitrate && m_kbps) if (Config.display_bitrate && m_kbps)
{ {
tracklength += " ["; tracklength += "(";
tracklength += boost::lexical_cast<std::string>(m_kbps); tracklength += boost::lexical_cast<std::string>(m_kbps);
tracklength += " kbps]"; tracklength += " kbps) ";
} }
tracklength += " ["; tracklength += "[";
if (m_total_time) if (m_total_time)
{ {
if (Config.display_remaining_time) if (Config.display_remaining_time)
@@ -584,17 +605,14 @@ void Status::Changes::elapsedTime(bool update_elapsed)
tracklength += MPD::Song::ShowTime(m_elapsed_time); tracklength += MPD::Song::ShowTime(m_elapsed_time);
tracklength += "/"; tracklength += "/";
tracklength += MPD::Song::ShowTime(m_total_time); tracklength += MPD::Song::ShowTime(m_total_time);
tracklength += "]";
} }
else else
{
tracklength += MPD::Song::ShowTime(m_elapsed_time); tracklength += MPD::Song::ShowTime(m_elapsed_time);
tracklength += "]"; tracklength += "]";
}
NC::WBuffer np_song; NC::WBuffer np_song;
Format::print(Config.song_status_wformat, np_song, &np); Format::print(Config.song_status_wformat, np_song, &np);
*wFooter << NC::XY(0, 1) << NC::TermManip::ClearToEOL << NC::Format::Bold << ps << NC::Format::NoBold; *wFooter << NC::XY(0, 1) << NC::TermManip::ClearToEOL << NC::Format::Bold << ps << ' ' << NC::Format::NoBold;
writeCyclicBuffer(np_song, *wFooter, playing_song_scroll_begin, wFooter->getWidth()-ps.length()-tracklength.length(), L" ** "); writeCyclicBuffer(np_song, *wFooter, playing_song_scroll_begin, wFooter->getWidth()-ps.length()-tracklength.length()-2, L" ** ");
*wFooter << NC::Format::Bold << NC::XY(wFooter->getWidth()-tracklength.length(), 1) << tracklength << NC::Format::NoBold; *wFooter << NC::Format::Bold << NC::XY(wFooter->getWidth()-tracklength.length(), 1) << tracklength << NC::Format::NoBold;
} }
break; break;
@@ -614,9 +632,9 @@ void Status::Changes::elapsedTime(bool update_elapsed)
// bitrate here doesn't look good, but it can be moved somewhere else later // bitrate here doesn't look good, but it can be moved somewhere else later
if (Config.display_bitrate && m_kbps) if (Config.display_bitrate && m_kbps)
{ {
tracklength += " "; tracklength += " (";
tracklength += boost::lexical_cast<std::string>(m_kbps); tracklength += boost::lexical_cast<std::string>(m_kbps);
tracklength += " kbps"; tracklength += " kbps)";
} }
NC::WBuffer first, second; NC::WBuffer first, second;
@@ -715,10 +733,10 @@ void Status::Changes::mixer()
switch (Config.design) switch (Config.design)
{ {
case Design::Classic: case Design::Classic:
VolumeState = " " "Volume" ": "; VolumeState = " Volume: ";
break; break;
case Design::Alternative: case Design::Alternative:
VolumeState = " " "Vol" ": "; VolumeState = " Vol: ";
break; break;
} }
if (m_volume < 0) if (m_volume < 0)