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

lastfm: queueJob: if old job is not finished, discard it and start new one

Browse Source
This commit is contained in:
Andrzej Rybczak
2013-09-22 23:40:44 +02:00
parent a494bb72d4
commit bea19bd0d7
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/lastfm.h
View File

@@ -51,16 +51,12 @@ struct Lastfm: Screen<NC::Scrollpad>, Tabbable
virtual bool isMergable() OVERRIDE { return true; } virtual bool isMergable() OVERRIDE { return true; }
template <typename ServiceT> template <typename ServiceT>
bool queueJob(ServiceT service) void queueJob(ServiceT service)
{ {
auto old_service = dynamic_cast<ServiceT *>(m_service.get()); auto old_service = dynamic_cast<ServiceT *>(m_service.get());
// if the same service and arguments were used, leave old info // if the same service and arguments were used, leave old info
if (old_service != nullptr && *old_service == service) if (old_service != nullptr && *old_service == service)
return true; return;
// download in progress
if (m_worker.valid() && !m_worker.is_ready())
return false;
m_service = std::make_shared<ServiceT>(std::forward<ServiceT>(service)); m_service = std::make_shared<ServiceT>(std::forward<ServiceT>(service));
m_worker = boost::async(boost::launch::async, boost::bind(&LastFm::Service::fetch, m_service.get())); m_worker = boost::async(boost::launch::async, boost::bind(&LastFm::Service::fetch, m_service.get()));
@@ -69,8 +65,6 @@ struct Lastfm: Screen<NC::Scrollpad>, Tabbable
w << "Fetching information..."; w << "Fetching information...";
w.flush(); w.flush();
m_title = ToWString(m_service->name()); m_title = ToWString(m_service->name());
return true;
} }
protected: protected: