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

Revert "Recursive UserPlaylist adding, subsonic uses UserPlaylist for folders" 

This reverts commit a62b7752ad.

Using this mechanism for recursively loading trees doesn't work any
more, wasn't that great to start with, and the tree view will soon
be replaced with a library view.
This commit is contained in:
Alan Briolat 2013-01-09 21:47:51 +00:00
parent 90d2511051
commit 38ce86529e
3 changed files with 6 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/internet/internetmodel.cpp
View File

@ -258,24 +258,8 @@ QMimeData* InternetModel::mimeData(const QModelIndexList& indexes) const {
int column = 0;
QModelIndex child = index.child(row, column);
while (child.isValid()) {
// If the playlist contains another playlist, expand it
if (child.data(Role_Type).toInt() == Type_UserPlaylist) {
// "List" of indexes to recurse on
QModelIndexList templist;
templist.append(child);
// We know this is going to be an InternetMimeData because we're calling
// ourselves with something that we always return InternetMimeData for!
InternetMimeData* recurse = qobject_cast<InternetMimeData*>(mimeData(templist));
// Add children if there were any
if (recurse) {
new_indexes.append(recurse->indexes);
urls.append(recurse->urls());
delete recurse;
}
} else {
new_indexes << child;
urls << child.data(Role_Url).toUrl();
}
new_indexes << child;
urls << child.data(Role_Url).toUrl();
child = index.child(++row, column);
}
} else {

18
src/internet/subsonicservice.cpp
View File

@ -47,14 +47,12 @@ void SubsonicService::LazyPopulate(QStandardItem *item)
{
switch (item->data(InternetModel::Role_Type).toInt())
{
// The "root" item
case InternetModel::Type_Service:
GetIndexes();
break;
// Any folder item
case InternetModel::Type_UserPlaylist:
qLog(Debug) << "Lazy loading" << item->data(Role_Id).toString();
case Type_Artist:
case Type_Album:
GetMusicDirectory(item->data(Role_Id).toString());
break;
@ -67,12 +65,6 @@ void SubsonicService::LazyPopulate(QStandardItem *item)
item->appendRow(loading);
}
smart_playlists::GeneratorPtr SubsonicService::CreateGenerator(QStandardItem* item)
{
qLog(Debug) << "Attempting to smart load" << item->data(Role_Id).toString();
return smart_playlists::GeneratorPtr();
}
void SubsonicService::ReloadSettings()
{
QSettings s;
@ -163,9 +155,8 @@ void SubsonicService::ReadArtist(QXmlStreamReader *reader, QStandardItem *parent
QString id = reader->attributes().value("id").toString();
QStandardItem *item = new QStandardItem(IconLoader::Load("document-open-folder"),
reader->attributes().value("name").toString());
item->setData(Type_Artist, InternetModel::Role_Type);
item->setData(true, InternetModel::Role_CanLazyLoad);
item->setData(InternetModel::Type_UserPlaylist, InternetModel::Role_Type);
item->setData(InternetModel::PlayBehaviour_SingleItem, InternetModel::Role_PlayBehaviour);
item->setData(id, Role_Id);
parent->appendRow(item);
item_lookup_.insert(id, item);
@ -178,9 +169,8 @@ void SubsonicService::ReadAlbum(QXmlStreamReader *reader, QStandardItem *parent)
QString id = reader->attributes().value("id").toString();
QStandardItem *item = new QStandardItem(IconLoader::Load("document-open-folder"),
reader->attributes().value("title").toString());
item->setData(Type_Album, InternetModel::Role_Type);
item->setData(true, InternetModel::Role_CanLazyLoad);
item->setData(InternetModel::Type_UserPlaylist, InternetModel::Role_Type);
item->setData(InternetModel::PlayBehaviour_SingleItem, InternetModel::Role_PlayBehaviour);
item->setData(id, Role_Id);
parent->appendRow(item);
item_lookup_.insert(id, item);

1
src/internet/subsonicservice.h
View File

@ -56,7 +56,6 @@ class SubsonicService : public InternetService
QStandardItem* CreateRootItem();
void LazyPopulate(QStandardItem *item);
smart_playlists::GeneratorPtr CreateGenerator(QStandardItem* item);
void ReloadSettings();
void Login();