diff options
Diffstat (limited to 'xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp')
-rw-r--r-- | xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp | 54 |
1 files changed, 1 insertions, 53 deletions
diff --git a/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp b/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp index 86f545fa12..425344219e 100644 --- a/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp +++ b/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp @@ -35,7 +35,6 @@ #include "utils/Variant.h" #include "utils/log.h" #include "video/VideoDatabase.h" -#include "video/VideoThumbLoader.h" #include "view/ViewState.h" #include <mutex> @@ -51,12 +50,10 @@ #define CONTROL_THUMBS 11 CGUIDialogVideoBookmarks::CGUIDialogVideoBookmarks() - : CGUIDialog(WINDOW_DIALOG_VIDEO_BOOKMARKS, "VideoOSDBookmarks.xml"), - CJobQueue(false, 1, CJob::PRIORITY_NORMAL) + : CGUIDialog(WINDOW_DIALOG_VIDEO_BOOKMARKS, "VideoOSDBookmarks.xml") { m_vecItems = new CFileItemList; m_loadType = LOAD_EVERY_TIME; - m_jobsStarted = 0; } CGUIDialogVideoBookmarks::~CGUIDialogVideoBookmarks() @@ -137,9 +134,6 @@ bool CGUIDialogVideoBookmarks::OnMessage(CGUIMessage& message) case 0: OnRefreshList(); break; - case 1: - UpdateItem(message.GetParam2()); - break; default: break; } @@ -202,30 +196,6 @@ void CGUIDialogVideoBookmarks::Delete(int item) Update(); } -void CGUIDialogVideoBookmarks::UpdateItem(unsigned int chapterIdx) -{ - std::unique_lock<CCriticalSection> lock(m_refreshSection); - - int itemPos = 0; - for (const auto& item : *m_vecItems) - { - if (chapterIdx == item->GetProperty("chapter").asInteger()) - break; - itemPos++; - } - - if (itemPos < m_vecItems->Size()) - { - std::string time = StringUtils::Format("chapter://{}/{}", m_filePath, chapterIdx); - std::string cachefile = CServiceBroker::GetTextureCache()->GetCachedPath( - CServiceBroker::GetTextureCache()->GetCacheFile(time) + ".jpg"); - if (CFileUtils::Exists(cachefile)) - { - (*m_vecItems)[itemPos]->SetArt("thumb", cachefile); - } - } -} - void CGUIDialogVideoBookmarks::OnRefreshList() { m_bookmarks.clear(); @@ -471,16 +441,11 @@ void CGUIDialogVideoBookmarks::OnWindowLoaded() m_viewControl.Reset(); m_viewControl.SetParentWindow(GetID()); m_viewControl.AddView(GetControl(CONTROL_THUMBS)); - m_jobsStarted = 0; - m_mapJobsChapter.clear(); m_vecItems->Clear(); } void CGUIDialogVideoBookmarks::OnWindowUnload() { - //stop running thumb extraction jobs - CancelJobs(); - m_mapJobsChapter.clear(); m_vecItems->Clear(); CGUIDialog::OnWindowUnload(); m_viewControl.Reset(); @@ -564,20 +529,3 @@ bool CGUIDialogVideoBookmarks::OnAddEpisodeBookmark() } return bReturn; } - -void CGUIDialogVideoBookmarks::OnJobComplete(unsigned int jobID, - bool success, CJob* job) -{ - if (success && IsActive()) - { - MAPJOBSCHAPS::iterator iter = m_mapJobsChapter.find(job); - if (iter != m_mapJobsChapter.end()) - { - unsigned int chapterIdx = (*iter).second; - CGUIMessage m(GUI_MSG_REFRESH_LIST, GetID(), 0, 1, chapterIdx); - CServiceBroker::GetAppMessenger()->SendGUIMessage(m); - m_mapJobsChapter.erase(iter); - } - } - CJobQueue::OnJobComplete(jobID, success, job); -} |