Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
mirror of https://github.com/strawberrymusicplayer/strawberry synced 2024-12-14 18:03:44 +01:00
Code Issues Releases Wiki Activity

Fix lowercased playlist album artist column

Browse Source 
Fixes #275
This commit is contained in:
Jonas Kvinge 2019-10-03 18:25:50 +02:00
parent 197cf85f56
commit 5599739433
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/song.cpp
View File

@ -296,7 +296,8 @@ const QString &Song::albumartist() const { return d->albumartist_; }
const QString &Song::albumartist_sortable() const { return d->albumartist_sortable_; } const QString &Song::albumartist_sortable() const { return d->albumartist_sortable_; }
const QString &Song::effective_albumartist() const { return d->albumartist_.isEmpty() ? d->artist_ : d->albumartist_; } const QString &Song::effective_albumartist() const { return d->albumartist_.isEmpty() ? d->artist_ : d->albumartist_; }
const QString &Song::effective_albumartist_sortable() const { return d->albumartist_.isEmpty() ? d->artist_sortable_ : d->albumartist_sortable_; } const QString &Song::effective_albumartist_sortable() const { return d->albumartist_.isEmpty() ? d->artist_sortable_ : d->albumartist_sortable_; }
const QString &Song::playlist_albumartist() const { return is_compilation() ? d->albumartist_sortable_ : effective_albumartist_sortable(); } const QString &Song::playlist_albumartist() const { return is_compilation() ? d->albumartist_ : effective_albumartist(); }
const QString &Song::playlist_albumartist_sortable() const { return is_compilation() ? d->albumartist_sortable_ : effective_albumartist_sortable(); }
int Song::track() const { return d->track_; } int Song::track() const { return d->track_; }
int Song::disc() const { return d->disc_; } int Song::disc() const { return d->disc_; }
int Song::year() const { return d->year_; } int Song::year() const { return d->year_; }

1
src/core/song.h
View File

@ -252,6 +252,7 @@ class Song {
// Playlist views are special because you don't want to fill in album artists automatically for compilations, but you do for normal albums: // Playlist views are special because you don't want to fill in album artists automatically for compilations, but you do for normal albums:
const QString &playlist_albumartist() const; const QString &playlist_albumartist() const;
const QString &playlist_albumartist_sortable() const;
// Returns true if this Song had it's cover manually unset by user. // Returns true if this Song had it's cover manually unset by user.
bool has_manually_unset_cover() const; bool has_manually_unset_cover() const;

2
src/playlist/playlist.cpp
View File

@ -1121,7 +1121,7 @@ bool Playlist::CompareItems(int column, Qt::SortOrder order, shared_ptr<Playlist
case Column_Year: cmp(year); case Column_Year: cmp(year);
case Column_OriginalYear: cmp(originalyear); case Column_OriginalYear: cmp(originalyear);
case Column_Genre: strcmp(genre); case Column_Genre: strcmp(genre);
case Column_AlbumArtist: strcmp(playlist_albumartist); case Column_AlbumArtist: strcmp(playlist_albumartist_sortable);
case Column_Composer: strcmp(composer); case Column_Composer: strcmp(composer);
case Column_Performer: strcmp(performer); case Column_Performer: strcmp(performer);
case Column_Grouping: strcmp(grouping); case Column_Grouping: strcmp(grouping);