Skip to content

Commit

Permalink
[art] make sure we assign trailer art via CVideoThumbLoader::SetArt t…
Browse files Browse the repository at this point in the history
…o ensure the art fallbacks are set
  • Loading branch information
Jonathan Marshall committed Dec 4, 2012
1 parent a65b40d commit 8dd07c9
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
9 changes: 7 additions & 2 deletions xbmc/video/VideoThumbLoader.h
Expand Up @@ -116,12 +116,17 @@ class CVideoThumbLoader : public CThumbLoader, public CJobQueue
*/
virtual void OnJobComplete(unsigned int jobID, bool success, CJob *job);

/*! \brief set the artwork map for an item
In addition, sets the standard fallbacks.
\param item the item on which to set art.
\param artwork the artwork map.
*/
static void SetArt(CFileItem &item, const std::map<std::string, std::string> &artwork);

protected:
virtual void OnLoaderStart();
virtual void OnLoaderFinish();

void SetArt(CFileItem &item, const std::map<std::string, std::string> &artwork);

IStreamDetailsObserver *m_pStreamDetailsObs;
CVideoDatabase *m_database;
typedef std::map<int, std::map<std::string, std::string> > ArtCache;
Expand Down
2 changes: 1 addition & 1 deletion xbmc/video/dialogs/GUIDialogVideoInfo.cpp
Expand Up @@ -850,7 +850,7 @@ void CGUIDialogVideoInfo::PlayTrailer()
*item.GetVideoInfoTag() = *m_movieItem->GetVideoInfoTag();
item.GetVideoInfoTag()->m_streamDetails.Reset();
item.GetVideoInfoTag()->m_strTitle.Format("%s (%s)",m_movieItem->GetVideoInfoTag()->m_strTitle.c_str(),g_localizeStrings.Get(20410));
item.SetArt(m_movieItem->GetArt());
CVideoThumbLoader::SetArt(item, m_movieItem->GetArt());
item.GetVideoInfoTag()->m_iDbId = -1;
item.GetVideoInfoTag()->m_iFileId = -1;

Expand Down

0 comments on commit 8dd07c9

Please sign in to comment.