iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

If grouping by genre and all genres selected, or grouping by arist and

Browse Source 
all artists selected - then just select random album from all albums
This commit is contained in:
Craig Drummond
2015-09-13 18:03:00 +01:00
parent d84c7506c7
commit b2616b2a44
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gui/librarypage.cpp
View File

@@ -358,6 +358,15 @@ void LibraryPage::addRandomAlbum()
break;
}
}
// If all items selected, then just choose random of all albums
if (SqlLibraryModel::T_Genre==MpdLibraryModel::self()->topLevel() && genres.size()==MpdLibraryModel::self()->rowCount(QModelIndex())) {
genres=QStringList();
}
if (SqlLibraryModel::T_Artist==MpdLibraryModel::self()->topLevel() && artists.size()==MpdLibraryModel::self()->rowCount(QModelIndex())) {
artists=QStringList();
}
LibraryDb::Album album=MpdLibraryModel::self()->getRandomAlbum(genres, artists);
if (album.artist.isEmpty() || album.id.isEmpty()) {
return;

9
online/onlinedbwidget.cpp
View File

@@ -148,6 +148,15 @@ void OnlineDbWidget::addRandomAlbum()
break;
}
}
// If all items selected, then just choose random of all albums
if (SqlLibraryModel::T_Genre==srv->topLevel() && genres.size()==srv->rowCount(QModelIndex())) {
genres=QStringList();
}
if (SqlLibraryModel::T_Artist==srv->topLevel() && artists.size()==srv->rowCount(QModelIndex())) {
artists=QStringList();
}
LibraryDb::Album album=srv->getRandomAlbum(genres, artists);
if (album.artist.isEmpty() || album.id.isEmpty()) {
return;