Add contextmenu option to remove resume points

xbmc · Aug 22, 2017 · 9b89488 · 9b89488
1 parent 0f9abae
commit 9b89488
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 1 deletion.
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
@@ -20625,7 +20625,13 @@ msgctxt "#38208"
 msgid "If EXIF information exists (date, time, camera used, etc.), it will be displayed."
 msgstr ""
 
-#empty strings from id 38209 to 38999
+#. Contextmenu entry to remove the resume point of the currently selected item
+#: xbmc/video/ContextMenus.h
+msgctxt "#38209"
+msgid "Remove resume point"
+msgstr ""
+
+#empty strings from id 38210 to 38999
 
 #: system/settings/settings.xml
 msgctxt "#39000"

diff --git a/xbmc/ContextMenuManager.cpp b/xbmc/ContextMenuManager.cpp
@@ -82,6 +82,7 @@ void CContextMenuManager::Init()
       std::make_shared<CONTEXTMENU::CSongInfo>(),
       std::make_shared<CONTEXTMENU::CMarkWatched>(),
       std::make_shared<CONTEXTMENU::CMarkUnWatched>(),
+      std::make_shared<CONTEXTMENU::CRemoveResumePoint>(),
       std::make_shared<CONTEXTMENU::CEjectDisk>(),
       std::make_shared<CONTEXTMENU::CEjectDrive>(),
       std::make_shared<CONTEXTMENU::CRemoveFavourite>(),

diff --git a/xbmc/video/ContextMenus.cpp b/xbmc/video/ContextMenus.cpp
@@ -49,6 +49,32 @@ bool CVideoInfo::Execute(const CFileItemPtr& item) const
   return true;
 }
 
+bool CRemoveResumePoint::IsVisible(const CFileItem& itemIn) const
+{
+  CFileItem item(itemIn.GetItemToPlay());
+  if (item.IsDeleted()) // e.g. trashed pvr recording
+    return false;
+
+  return CGUIWindowVideoBase::HasResumeItemOffset(&item);
+}
+
+bool CRemoveResumePoint::Execute(const CFileItemPtr& item) const
+{
+  // Remove the actual value
+  CVideoDatabase videoDatabase;
+  if (videoDatabase.Open())
+  {
+    videoDatabase.DeleteResumeBookMark(item->GetVideoInfoTag()->m_strFileNameAndPath);
+  }
+  // Remove the one we're showing in the frontend
+  auto videoInfoTag = item->GetVideoInfoTag();
+  CBookmark resumePoint(videoInfoTag->GetResumePoint());
+  resumePoint.timeInSeconds = 0;
+  videoInfoTag->SetResumePoint(resumePoint);
+
+  return true;
+}
+
 bool CMarkWatched::IsVisible(const CFileItem& item) const
 {
   if (item.IsDeleted()) // e.g. trashed pvr recording

diff --git a/xbmc/video/ContextMenus.h b/xbmc/video/ContextMenus.h
@@ -56,6 +56,13 @@ struct CMovieInfo : CVideoInfo
   CMovieInfo() : CVideoInfo(MediaTypeMovie) {}
 };
 
+struct CRemoveResumePoint : CStaticContextMenuAction
+{
+  CRemoveResumePoint() : CStaticContextMenuAction(38209) {}
+  bool IsVisible(const CFileItem& item) const override;
+  bool Execute(const CFileItemPtr& item) const override;
+};
+
 struct CMarkWatched : CStaticContextMenuAction
 {
   CMarkWatched() : CStaticContextMenuAction(16103) {}