Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
mirror of https://github.com/clementine-player/Clementine synced 2024-12-17 03:45:56 +01:00
Code Issues Releases Wiki Activity

Reverted changes amde to groupby_performer

Browse Source
This commit is contained in:
Ignas Kaziukenas 2014-10-27 15:49:11 +02:00
parent 2f24963769
commit a2df43c830
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/globalsearch/globalsearchmodel.cpp
View File

@ -128,8 +128,8 @@ QStandardItem* GlobalSearchModel::BuildContainers(const Song& s,
case LibraryModel::GroupBy_Composer:
display_text = s.composer();
// case LibraryModel::GroupBy_Performer:
// display_text = s.performer();
case LibraryModel::GroupBy_Performer:
display_text = s.performer();
case LibraryModel::GroupBy_Disc:
display_text = s.disc();
case LibraryModel::GroupBy_Grouping:

4
src/library/groupbydialog.cpp
View File

@ -78,9 +78,9 @@ GroupByDialog::GroupByDialog(QWidget* parent)
p_->mapping_.insert(Mapping(LibraryModel::GroupBy_Year, 7));
p_->mapping_.insert(Mapping(LibraryModel::GroupBy_YearAlbum, 8));
p_->mapping_.insert(Mapping(LibraryModel::GroupBy_Bitrate, 9));
// p_->mapping_.insert(Mapping(LibraryModel::GroupBy_Performer, 10));
p_->mapping_.insert(Mapping(LibraryModel::GroupBy_Disc, 10));
p_->mapping_.insert(Mapping(LibraryModel::GroupBy_Grouping, 11));
p_->mapping_.insert(Mapping(LibraryModel::GroupBy_Performer, 11));
p_->mapping_.insert(Mapping(LibraryModel::GroupBy_Grouping, 12));
connect(ui_->button_box->button(QDialogButtonBox::Reset), SIGNAL(clicked()),
SLOT(Reset()));

30
src/library/librarymodel.cpp
View File

@ -203,9 +203,9 @@ void LibraryModel::SongsDiscovered(const SongList& songs) {
case GroupBy_Composer:
key = song.composer();
break;
// case GroupBy_Performer:
// key = song.performer();
// break;
case GroupBy_Performer:
key = song.performer();
break;
case GroupBy_Disc:
key = song.disc();
break;
@ -298,7 +298,7 @@ QString LibraryModel::DividerKey(GroupBy type, LibraryItem* item) const {
case GroupBy_Album:
case GroupBy_Artist:
case GroupBy_Composer:
// case GroupBy_Performer:
case GroupBy_Performer:
case GroupBy_Disc:
case GroupBy_Grouping:
case GroupBy_Genre:
@ -337,7 +337,7 @@ QString LibraryModel::DividerDisplayText(GroupBy type,
case GroupBy_Album:
case GroupBy_Artist:
case GroupBy_Composer:
// case GroupBy_Performer:
case GroupBy_Performer:
case GroupBy_Disc:
case GroupBy_Grouping:
case GroupBy_Genre:
@ -785,9 +785,9 @@ void LibraryModel::InitQuery(GroupBy type, LibraryQuery* q) {
case GroupBy_Composer:
q->SetColumnSpec("DISTINCT composer");
break;
// case GroupBy_Performer:
// q->SetColumnSpec("DISTINCT performer");
// break;
case GroupBy_Performer:
q->SetColumnSpec("DISTINCT performer");
break;
case GroupBy_Disc:
q->SetColumnSpec("DISTINCT disc");
break;
@ -846,9 +846,9 @@ void LibraryModel::FilterQuery(GroupBy type, LibraryItem* item,
case GroupBy_Composer:
q->AddWhere("composer", item->key);
break;
// case GroupBy_Performer:
// q->AddWhere("performer", item->key);
// break;
case GroupBy_Performer:
q->AddWhere("performer", item->key);
break;
case GroupBy_Disc:
q->AddWhere("disc", item->key);
break;
@ -926,7 +926,7 @@ LibraryItem* LibraryModel::ItemFromQuery(GroupBy type, bool signal,
break;
case GroupBy_Composer:
// case GroupBy_Performer:
case GroupBy_Performer:
case GroupBy_Disc:
case GroupBy_Grouping:
case GroupBy_Genre:
@ -991,9 +991,9 @@ LibraryItem* LibraryModel::ItemFromSong(GroupBy type, bool signal,
case GroupBy_Composer:
item->key = s.composer();
// case GroupBy_Performer:
// item->key = s.performer();
case GroupBy_Disc:
case GroupBy_Performer:
item->key = s.performer();
case GroupBy_Disc:
item->key = s.disc();
case GroupBy_Grouping:
item->key = s.grouping();

4
src/library/librarymodel.h
View File

@ -81,10 +81,10 @@ class LibraryModel : public SimpleTreeModel<LibraryItem> {
GroupBy_Genre = 6,
GroupBy_AlbumArtist = 7,
GroupBy_FileType = 8,
// GroupBy_Performer = 9,
GroupBy_Disc = 9,
GroupBy_Performer = 9,
GroupBy_Grouping = 10,
GroupBy_Bitrate = 11,
GroupBy_Disc = 12,
};
struct Grouping {