diff options
| author | Dave Blake <oak99sky@yahoo.co.uk> | 2015-11-10 09:28:16 +0000 |
|---|---|---|
| committer | Dave Blake <oak99sky@yahoo.co.uk> | 2015-11-10 09:28:16 +0000 |
| commit | 1ef2c89362c8af510a8fb9bc56cba15000bbfed1 (patch) | |
| tree | 9576e885c5f47e9de8f26a98e4ce0c2fd5384102 | |
| parent | 7ee26d9c296e96bc8ee448c495dad12da901dae8 (diff) | |
| parent | 3cff1b58982a9bbf188d4c884c29971b6c92c48b (diff) | |
Merge pull request #8354 from DaveTBlake/ArtistDescNotVector
Fix missing artist names in legacy Python music interface
| -rw-r--r-- | xbmc/interfaces/legacy/InfoTagMusic.cpp | 4 | ||||
| -rw-r--r-- | xbmc/music/MusicDatabase.cpp | 4 | ||||
| -rw-r--r-- | xbmc/music/windows/GUIWindowMusicNav.cpp | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/xbmc/interfaces/legacy/InfoTagMusic.cpp b/xbmc/interfaces/legacy/InfoTagMusic.cpp index fe01cba12b..6b6e416948 100644 --- a/xbmc/interfaces/legacy/InfoTagMusic.cpp +++ b/xbmc/interfaces/legacy/InfoTagMusic.cpp @@ -54,12 +54,12 @@ namespace XBMCAddon String InfoTagMusic::getArtist() { - return StringUtils::Join(infoTag->GetArtist(), g_advancedSettings.m_musicItemSeparator); + return infoTag->GetArtistString(); } String InfoTagMusic::getAlbumArtist() { - return StringUtils::Join(infoTag->GetAlbumArtist(), g_advancedSettings.m_musicItemSeparator); + return infoTag->GetAlbumArtistString(); } String InfoTagMusic::getAlbum() diff --git a/xbmc/music/MusicDatabase.cpp b/xbmc/music/MusicDatabase.cpp index 7502f31875..1e29e06789 100644 --- a/xbmc/music/MusicDatabase.cpp +++ b/xbmc/music/MusicDatabase.cpp @@ -5307,7 +5307,7 @@ void CMusicDatabase::ImportFromXML(const std::string &xmlFile) CAlbum importedAlbum; importedAlbum.Load(entry); strTitle = importedAlbum.strAlbum; - int idAlbum = GetAlbumByName(importedAlbum.strAlbum, importedAlbum.GetAlbumArtist()); + int idAlbum = GetAlbumByName(importedAlbum.strAlbum, importedAlbum.GetAlbumArtistString()); if (idAlbum > -1) { CAlbum album; @@ -5399,7 +5399,7 @@ void CMusicDatabase::SetPropertiesForFileItem(CFileItem& item) int idAlbum = item.GetMusicInfoTag()->GetAlbumId(); if (idAlbum <= 0) idAlbum = GetAlbumByName(item.GetMusicInfoTag()->GetAlbum(), - item.GetMusicInfoTag()->GetArtist()); + item.GetMusicInfoTag()->GetArtistString()); if (idAlbum > -1) { CAlbum album; diff --git a/xbmc/music/windows/GUIWindowMusicNav.cpp b/xbmc/music/windows/GUIWindowMusicNav.cpp index 10a11e63de..a0d6ef167c 100644 --- a/xbmc/music/windows/GUIWindowMusicNav.cpp +++ b/xbmc/music/windows/GUIWindowMusicNav.cpp @@ -549,16 +549,16 @@ void CGUIWindowMusicNav::GetContextButtons(int itemNumber, CContextButtons &butt // 4. specific per album buttons.Add(CONTEXT_BUTTON_SET_CONTENT, 20195); } - if (item->HasMusicInfoTag() && item->GetMusicInfoTag()->GetArtist().size() > 0) + if (item->HasMusicInfoTag() && !item->GetMusicInfoTag()->GetArtistString().empty()) { CVideoDatabase database; database.Open(); if (database.GetMatchingMusicVideo(item->GetMusicInfoTag()->GetArtistString()) > -1) buttons.Add(CONTEXT_BUTTON_GO_TO_ARTIST, 20400); } - if (item->HasMusicInfoTag() && item->GetMusicInfoTag()->GetArtist().size() > 0 && - item->GetMusicInfoTag()->GetAlbum().size() > 0 && - item->GetMusicInfoTag()->GetTitle().size() > 0) + if (item->HasMusicInfoTag() && !item->GetMusicInfoTag()->GetArtistString().empty() && + !item->GetMusicInfoTag()->GetAlbum().empty() && + !item->GetMusicInfoTag()->GetTitle().empty()) { CVideoDatabase database; database.Open(); |