diff options
author | Jonathan Marshall <jmarshall@never.you.mind> | 2012-05-10 10:19:35 +1200 |
---|---|---|
committer | Jonathan Marshall <jmarshall@never.you.mind> | 2012-05-10 10:19:35 +1200 |
commit | 9ce319fa2e56d8c6988fe1b4681e765e4c47fe1d (patch) | |
tree | 339a3a332c139fb813cf2b5a833307c2bad947c3 | |
parent | 19df5c90527fd5a17cd63de161f87dca834b85ed (diff) |
Revert "fire OnUpdate events when the thumb or fanart is updated in the video info dialog, fixes #13005."
This reverts commit 0e6b47804558e4d19a572838003cdf880ef3588c.
-rw-r--r-- | xbmc/video/VideoDatabase.cpp | 5 | ||||
-rw-r--r-- | xbmc/video/dialogs/GUIDialogVideoInfo.cpp | 10 | ||||
-rw-r--r-- | xbmc/video/dialogs/GUIDialogVideoInfo.h | 1 | ||||
-rw-r--r-- | xbmc/windows/GUIWindowHome.cpp | 2 |
4 files changed, 5 insertions, 13 deletions
diff --git a/xbmc/video/VideoDatabase.cpp b/xbmc/video/VideoDatabase.cpp index 59d97286ee..b7ec409128 100644 --- a/xbmc/video/VideoDatabase.cpp +++ b/xbmc/video/VideoDatabase.cpp @@ -3941,6 +3941,11 @@ void CVideoDatabase::UpdateFanart(const CFileItem &item, VIDEODB_CONTENT_TYPE ty try { m_pDS->exec(exec.c_str()); + + if (type == VIDEODB_CONTENT_TVSHOWS) + AnnounceUpdate("tvshow", item.GetVideoInfoTag()->m_iDbId); + else if (type == VIDEODB_CONTENT_MOVIES) + AnnounceUpdate("movie", item.GetVideoInfoTag()->m_iDbId); } catch (...) { diff --git a/xbmc/video/dialogs/GUIDialogVideoInfo.cpp b/xbmc/video/dialogs/GUIDialogVideoInfo.cpp index aeacde3266..ab4d709a21 100644 --- a/xbmc/video/dialogs/GUIDialogVideoInfo.cpp +++ b/xbmc/video/dialogs/GUIDialogVideoInfo.cpp @@ -46,7 +46,6 @@ #include "guilib/LocalizeStrings.h" #include "GUIUserMessages.h" #include "TextureCache.h" -#include "interfaces/AnnouncementManager.h" using namespace std; using namespace XFILE; @@ -670,7 +669,6 @@ void CGUIDialogVideoInfo::OnGetThumb() VIDEO::CVideoInfoScanner::ApplyThumbToFolder(m_movieItem->GetProperty("set_folder_thumb").asString(), newThumb); } m_hasUpdatedThumb = true; - AnnounceUpdate("thumb"); // Update our screen Update(); @@ -770,19 +768,11 @@ void CGUIDialogVideoInfo::OnGetFanart() else m_movieItem->ClearProperty("fanart_image"); m_hasUpdatedThumb = true; - AnnounceUpdate("fanart"); // Update our screen Update(); } -void CGUIDialogVideoInfo::AnnounceUpdate(const std::string &type) -{ - CVariant data; - data["art"] = type; - ANNOUNCEMENT::CAnnouncementManager::Announce(ANNOUNCEMENT::VideoLibrary, "xbmc", "OnUpdate", CFileItemPtr(new CFileItem(*m_movieItem)), data); -} - void CGUIDialogVideoInfo::PlayTrailer() { CFileItem item; diff --git a/xbmc/video/dialogs/GUIDialogVideoInfo.h b/xbmc/video/dialogs/GUIDialogVideoInfo.h index 1aa8339924..d5f2584fc6 100644 --- a/xbmc/video/dialogs/GUIDialogVideoInfo.h +++ b/xbmc/video/dialogs/GUIDialogVideoInfo.h @@ -47,7 +47,6 @@ public: protected: void Update(); void SetLabel(int iControl, const CStdString& strLabel); - void AnnounceUpdate(const std::string &type); // link cast to movies void ClearCastList(); diff --git a/xbmc/windows/GUIWindowHome.cpp b/xbmc/windows/GUIWindowHome.cpp index 06554f62f4..a139371c1a 100644 --- a/xbmc/windows/GUIWindowHome.cpp +++ b/xbmc/windows/GUIWindowHome.cpp @@ -69,8 +69,6 @@ void CGUIWindowHome::Announce(AnnouncementFlag flag, const char *sender, const c { if (data.isMember("playcount")) ra_flag |= Totals; - if (data.isMember("art")) - ra_flag |= Video; } else if (strcmp(message, "OnScanFinished") == 0) { |