diff options
| author | Martijn Kaijser <martijn@xbmc.org> | 2016-04-15 18:52:10 +0200 |
|---|---|---|
| committer | Martijn Kaijser <martijn@xbmc.org> | 2016-04-15 18:52:10 +0200 |
| commit | dd2daf674696bfb57d138908197178b7aa595ef2 (patch) | |
| tree | 82118714e53e192f845e3b22812b60df2882a8b3 | |
| parent | 2baa51266144e970bdb04a959542298cd449d13f (diff) | |
| parent | 1c7c68ae518213cb81e24d45f562d1ba154262fc (diff) | |
Merge pull request #9626 from DaveTBlake/JarvisCueSheetPlaying
[Jarvis] 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 7c66e9e5d3..b5a18eeab1 100644 --- a/xbmc/FileItem.cpp +++ b/xbmc/FileItem.cpp @@ -1475,7 +1475,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 |