diff options
| author | Matthias Kortstiege <mkortstiege@users.noreply.github.com> | 2015-03-19 07:58:39 +0100 |
|---|---|---|
| committer | Matthias Kortstiege <mkortstiege@users.noreply.github.com> | 2015-03-19 07:58:39 +0100 |
| commit | bbc287faf0813ae4915f931b43707c70e04d42ef (patch) | |
| tree | d3c1554b6ec400d9ea6064279b1d1f3212c8fa1b | |
| parent | 28fc68b436a7db84a7ed5165c41d0c43a65d2f62 (diff) | |
| parent | 6020fa6305eed6569e55b5c6eaad7e8c0b5d40c9 (diff) | |
Merge pull request #6761 from mkortstiege/artwork
[art] container.art() fixes
| -rw-r--r-- | xbmc/music/windows/GUIWindowMusicBase.cpp | 16 | ||||
| -rw-r--r-- | xbmc/video/windows/GUIWindowVideoNav.cpp | 2 |
2 files changed, 11 insertions, 7 deletions
diff --git a/xbmc/music/windows/GUIWindowMusicBase.cpp b/xbmc/music/windows/GUIWindowMusicBase.cpp index eff3709bd7..dc8934163b 100644 --- a/xbmc/music/windows/GUIWindowMusicBase.cpp +++ b/xbmc/music/windows/GUIWindowMusicBase.cpp @@ -1132,7 +1132,7 @@ void CGUIWindowMusicBase::OnRetrieveMusicInfo(CFileItemList& items) bool CGUIWindowMusicBase::GetDirectory(const std::string &strDirectory, CFileItemList &items) { - items.SetArt("thumb", ""); + items.ClearArt(); bool bResult = CGUIMediaWindow::GetDirectory(strDirectory, items); if (bResult) { @@ -1141,14 +1141,18 @@ bool CGUIWindowMusicBase::GetDirectory(const std::string &strDirectory, CFileIte } CQueryParams params; - map<string, string> art; CDirectoryNode::GetDatabaseInfo(items.GetPath(), params); - if (params.GetAlbumId() && m_musicdatabase.GetArtistArtForItem(params.GetAlbumId(), MediaTypeAlbum, art)) - items.AppendArt(art, MediaTypeAlbum); + if (params.GetAlbumId()) + { + map<string, string> artistArt; + if (m_musicdatabase.GetArtistArtForItem(params.GetAlbumId(), MediaTypeAlbum, artistArt)) + items.AppendArt(artistArt, MediaTypeArtist); - if (params.GetArtistId() && m_musicdatabase.GetArtForItem(params.GetArtistId(), MediaTypeArtist, art)) - items.AppendArt(art, MediaTypeArtist); + map<string, string> albumArt; + if (m_musicdatabase.GetArtForItem(params.GetAlbumId(), MediaTypeAlbum, albumArt)) + items.AppendArt(albumArt, MediaTypeAlbum); + } // add in the "New Playlist" item if we're in the playlists folder if ((items.GetPath() == "special://musicplaylists/") && !items.Contains("newplaylist://")) diff --git a/xbmc/video/windows/GUIWindowVideoNav.cpp b/xbmc/video/windows/GUIWindowVideoNav.cpp index 24970462e3..4a33ceeb1f 100644 --- a/xbmc/video/windows/GUIWindowVideoNav.cpp +++ b/xbmc/video/windows/GUIWindowVideoNav.cpp @@ -313,6 +313,7 @@ bool CGUIWindowVideoNav::GetDirectory(const std::string &strDirectory, CFileItem if (m_thumbLoader.IsLoading()) m_thumbLoader.StopThread(); + items.ClearArt(); items.ClearProperties(); bool bResult = CGUIWindowVideoBase::GetDirectory(strDirectory, items); @@ -365,7 +366,6 @@ bool CGUIWindowVideoNav::GetDirectory(const std::string &strDirectory, CFileItem } } - items.SetArt("thumb", ""); if (node == VIDEODATABASEDIRECTORY::NODE_TYPE_EPISODES || node == NODE_TYPE_SEASONS || node == NODE_TYPE_RECENTLY_ADDED_EPISODES) |