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

Fix retrieval of covers from file-system based devices.

Browse Source
This commit is contained in:
craig.p.drummond
2012-10-02 20:44:39 +00:00
committed by craig.p.drummond
parent 7e0ed911d6
commit 8d7dcbcb35
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -43,6 +43,7 @@
23. Fix image/icon size, and spacing issues, in sync dialog when the library
view is set to use icon/list style.
24. Add 'Add to playlist' action to playqueue context menu.
25. Fix retrieval of covers from file-system based devices.
0.8.3.1
-------

2
devices/fsdevice.cpp
View File

@@ -380,7 +380,7 @@ void FsDevice::copySongToResult(int status)
if (FileJob::StatusOk!=status) {
emit actionStatus(Failed);
} else {
QString sourceDir=MPDParseUtils::getDir(currentSong.file);
QString sourceDir=MPDParseUtils::getDir(audioFolder+currentSong.file);
currentSong.file=currentMusicPath; // MPD's paths are not full!!!
Covers::copyCover(currentSong, sourceDir, currentBaseDir+MPDParseUtils::getDir(currentMusicPath), QString());
if (needToFixVa) {

4
models/musiclibraryitemalbum.cpp
View File

@@ -222,8 +222,8 @@ const QPixmap & MusicLibraryItemAlbum::cover()
song.year=m_year;
song.file=firstSong->file();
#ifdef ENABLE_DEVICES_SUPPORT
if (!song.file.startsWith("/") && parent() && parent()->parent() && qobject_cast<Device *>(parent()->parent())) {
QString root=static_cast<Device *>(parent()->parent())->path();
if (!song.file.startsWith("/") && parentItem() && parentItem()->parentItem() && qobject_cast<Device *>(parentItem()->parentItem())) {
QString root=static_cast<Device *>(parentItem()->parentItem())->path();
if (!root.isEmpty()) {
song.file=Utils::dirSyntax(root)+song.file;
}