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

Only split cue file into tracks if there are more tracks than source files.

Browse Source
This commit is contained in:
craig.p.drummond
2013-07-03 15:38:20 +00:00
committed by craig.p.drummond
parent c604d84629
commit 850ec24bc7
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
models/albumsmodel.cpp
View File

@@ -268,7 +268,7 @@ QVariant AlbumsModel::data(const QModelIndex &index, int role) const
default:
return ActionModel::data(index, role);
case Qt::DecorationRole:
return Icon(Song::Playlist==si->type ? "view-media-playlist" : "audio-x-generic");
return Song::Playlist==si->type ? Icons::self()->playlistIcon : Icons::self()->audioFileIcon;
case Qt::ToolTipRole: {
quint32 year=si->parent->songs.count() ? si->parent->songs.at(0)->year : 0;
return si->parent->artist+QLatin1String("<br/>")+

3
mpd/mpdparseutils.cpp
View File

@@ -396,7 +396,8 @@ MusicLibraryItemRoot * MPDParseUtils::parseLibraryItems(const QByteArray &data,
if (Song::Playlist==currentSong.type) {
ParsedCueFile cf;
if (canSplitCue && currentSong.file.endsWith(".cue", Qt::CaseInsensitive) && CueFile::parse(currentSong.file, mpdDir, cf.songs, cf.files)) {
if (canSplitCue && currentSong.file.endsWith(".cue", Qt::CaseInsensitive) && CueFile::parse(currentSong.file, mpdDir, cf.songs, cf.files) &&
cf.files.count()<cf.songs.count()) {
if (albumItem) {
QMap<QString, Song> origFiles=albumItem->getSongs(cf.files);
if (origFiles.size()==cf.files.size()) {