diff options
| author | DaveTBlake <oak99sky@yahoo.co.uk> | 2016-04-14 18:37:45 +0100 |
|---|---|---|
| committer | DaveTBlake <oak99sky@yahoo.co.uk> | 2016-04-14 18:37:45 +0100 |
| commit | 1c7c68ae518213cb81e24d45f562d1ba154262fc (patch) | |
| tree | 5e73f4da668b0b3b767d31f08898b912ff22d6c1 | |
| parent | 445b45ab6eb211cf48d2614821b8efcdb8f63727 (diff) | |
Fix song reported on playback of songs from cuesheet
| -rw-r--r-- | xbmc/FileItem.cpp | 7 | ||||
| -rw-r--r-- | xbmc/interfaces/json-rpc/schema/version.txt | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/xbmc/FileItem.cpp b/xbmc/FileItem.cpp index 49c7eec423..be6689a4e8 100644 --- a/xbmc/FileItem.cpp +++ b/xbmc/FileItem.cpp @@ -1468,7 +1468,12 @@ void CFileItem::SetFromSong(const CSong &song) { if (!song.strTitle.empty()) SetLabel(song.strTitle); - if (!song.strFileName.empty()) + if (song.idSong > 0) + { + std::string strExt = URIUtils::GetExtension(song.strFileName); + m_strPath = StringUtils::Format("musicdb://songs/%i%s", song.idSong, strExt.c_str()); + } + else if (!song.strFileName.empty()) m_strPath = song.strFileName; GetMusicInfoTag()->SetSong(song); m_lStartOffset = song.iStartOffset; diff --git a/xbmc/interfaces/json-rpc/schema/version.txt b/xbmc/interfaces/json-rpc/schema/version.txt index d9589113ad..73b46b0715 100644 --- a/xbmc/interfaces/json-rpc/schema/version.txt +++ b/xbmc/interfaces/json-rpc/schema/version.txt @@ -1 +1 @@ -6.32.4 +6.32.5 |