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

Fix reading embedded lyrics

Browse Source 
Issue #1211
This commit is contained in:
Craig Drummond
2018-02-14 17:43:29 +00:00
parent b23d3089b9
commit f9da37f2e7
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
context/songview.cpp
View File

@@ -85,14 +85,9 @@ static QString lyricsOtherFileName(const Song &song)
}
#endif
static inline QString mpdLyricsFilePath(const QString &songFile)
{
return Utils::changeExtension(MPDConnection::self()->getDetails().dir+songFile, SongView::constExtension);
}
static inline QString mpdLyricsFilePath(const Song &song)
{
return mpdLyricsFilePath(song.filePath());
return Utils::changeExtension(song.filePath(MPDConnection::self()->getDetails().dir), SongView::constExtension);
}
static inline QString fixNewLines(const QString &o)
@@ -358,7 +353,7 @@ void SongView::loadLyrics()
if (currentSong.isCantataStream() || (!MPDConnection::self()->getDetails().dir.isEmpty() && !currentSong.file.isEmpty() && !currentSong.isNonMPD())) {
QString songFile=currentSong.filePath(MPDConnection::self()->getDetails().dir);
QString mpdLyrics=mpdLyricsFilePath(songFile);
QString mpdLyrics=mpdLyricsFilePath(currentSong);
if (!currentSong.isCantataStream() && MPDConnection::self()->getDetails().dir.startsWith(QLatin1String("http:/"))) {
QUrl url(mpdLyrics);
@@ -368,7 +363,7 @@ void SongView::loadLyrics()
return;
} else {
#ifdef TAGLIB_FOUND
QString tagLyrics=Tags::readLyrics(MPDConnection::self()->getDetails().dir+songFile);
QString tagLyrics=Tags::readLyrics(songFile);
if (!tagLyrics.isEmpty()) {
text->setText(fixNewLines(tagLyrics));