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

Make lyrics and last_fm screens lockable and startup screens

Browse Source
This commit is contained in:
Andrzej Rybczak
2016-12-25 16:06:38 +01:00
parent e9ae99b5f0
commit 4cd94cb4b3
9 changed files with 81 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/screens/lastfm.cpp
View File

@@ -33,7 +33,8 @@ using Global::MainStartY;
Lastfm *myLastfm;
Lastfm::Lastfm()
: Screen(NC::Scrollpad(0, MainStartY, COLS, MainHeight, "", Config.main_color, NC::Border()))
: Screen(NC::Scrollpad(0, MainStartY, COLS, MainHeight, "", Config.main_color, NC::Border()))
, m_refresh_window(false)
{ }
void Lastfm::resize()
@@ -47,13 +48,36 @@ void Lastfm::resize()
std::wstring Lastfm::title()
{
return m_title;
if (m_title.empty())
return L"Last.fm";
else
return m_title;
}
void Lastfm::update()
{
if (m_worker.valid() && m_worker.is_ready())
getResult();
{
auto result = m_worker.get();
if (result.first)
{
w.clear();
w << Charset::utf8ToLocale(result.second);
m_service->beautifyOutput(w);
}
else
w << " " << NC::Color::Red << result.second << NC::Color::End;
// reset m_worker so it's no longer valid
m_worker = boost::BOOST_THREAD_FUTURE<LastFm::Service::Result>();
m_refresh_window = true;
}
if (m_refresh_window)
{
m_refresh_window = false;
w.flush();
w.refresh();
}
}
void Lastfm::switchTo()
@@ -67,20 +91,3 @@ void Lastfm::switchTo()
else
switchToPreviousScreen();
}
void Lastfm::getResult()
{
auto result = m_worker.get();
if (result.first)
{
w.clear();
w << Charset::utf8ToLocale(result.second);
m_service->beautifyOutput(w);
}
else
w << " " << NC::Color::Red << result.second << NC::Color::End;
w.flush();
w.refresh();
// reset m_worker so it's no longer valid
m_worker = boost::BOOST_THREAD_FUTURE<LastFm::Service::Result>();
}