Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Don't fetch subsonic library until service is expanded

This commit is contained in:
Alan Briolat 2013-01-20 23:25:54 +00:00
parent a7fe1b693b
commit d424ed93a4
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/internet/subsonicservice.cpp
View File

@ -41,6 +41,7 @@ SubsonicService::SubsonicService(Application* app, InternetModel *parent)
library_model_(NULL),
library_filter_(NULL),
library_sort_model_(new QSortFilterProxyModel(this)),
total_song_count_(0),
login_state_(LoginState_OtherError)
{
app_->player()->RegisterUrlHandler(url_handler_);
@ -101,6 +102,9 @@ void SubsonicService::LazyPopulate(QStandardItem *item)
{
case InternetModel::Type_Service:
library_model_->Init();
if (total_song_count_ == 0 && !load_database_task_id_) {
ReloadDatabase();
}
model()->merged_model()->AddSubModel(item->index(), library_sort_model_);
break;
@ -186,8 +190,7 @@ QNetworkReply* SubsonicService::Send(const QUrl &url)
void SubsonicService::UpdateTotalSongCount(int count)
{
if (count == 0 && !load_database_task_id_)
ReloadDatabase();
total_song_count_ = count;
}
void SubsonicService::ReloadDatabase()

1
src/internet/subsonicservice.h
View File

@ -102,6 +102,7 @@ class SubsonicService : public InternetService
LibraryModel* library_model_;
LibraryFilterWidget* library_filter_;
QSortFilterProxyModel* library_sort_model_;
int total_song_count_;
// Configuration
QString server_;