X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_menu.cc;h=3bdaf259110bf0e0fdf9b204c5059f86ace3d54d;hb=59e769023c392c332331567a1aea94660002c463;hp=6372503d14db465069eb62b16ff010ad49dac0b8;hpb=521c09170d9e62cd72cc2da66c41816761008a4b;p=dcpomatic.git

diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 6372503d1..3bdaf2591 100644
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -26,6 +26,7 @@
 #include "lib/examine_content_job.h"
 #include "lib/job_manager.h"
 #include "lib/exceptions.h"
+#include "lib/dcp_content.h"
 #include "content_menu.h"
 #include "repeat_dialog.h"
 #include "wx_util.h"
@@ -40,23 +41,28 @@ enum {
 	ID_repeat = 1,
 	ID_join,
 	ID_find_missing,
+	ID_re_examine,
+	ID_kdm,
 	ID_remove
 };
 
-ContentMenu::ContentMenu (shared_ptr<Film> f, wxWindow* p)
+ContentMenu::ContentMenu (wxWindow* p)
 	: _menu (new wxMenu)
-	, _film (f)
 	, _parent (p)
 {
 	_repeat = _menu->Append (ID_repeat, _("Repeat..."));
 	_join = _menu->Append (ID_join, _("Join"));
 	_find_missing = _menu->Append (ID_find_missing, _("Find missing..."));
+	_re_examine = _menu->Append (ID_re_examine, _("Re-examine..."));
+	_kdm = _menu->Append (ID_kdm, _("Add KDM..."));
 	_menu->AppendSeparator ();
 	_remove = _menu->Append (ID_remove, _("Remove"));
 
 	_parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::repeat, this), ID_repeat);
 	_parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::join, this), ID_join);
 	_parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::find_missing, this), ID_find_missing);
+	_parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::re_examine, this), ID_re_examine);
+	_parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::kdm, this), ID_kdm);
 	_parent->Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&ContentMenu::remove, this), ID_remove);
 }
 
@@ -66,8 +72,9 @@ ContentMenu::~ContentMenu ()
 }
 
 void
-ContentMenu::popup (ContentList c, wxPoint p)
+ContentMenu::popup (weak_ptr<Film> f, ContentList c, wxPoint p)
 {
+	_film = f;
 	_content = c;
 	_repeat->Enable (!_content.empty ());
 
@@ -81,6 +88,15 @@ ContentMenu::popup (ContentList c, wxPoint p)
 	_join->Enable (n > 1);
 	
 	_find_missing->Enable (_content.size() == 1 && !_content.front()->paths_valid ());
+	_re_examine->Enable (!_content.empty ());
+
+	if (_content.size() == 1) {
+		shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (_content.front ());
+		_kdm->Enable (dcp && dcp->encrypted ());
+	} else {
+		_kdm->Enable (false);
+	}
+	
 	_remove->Enable (!_content.empty ());
 	_parent->PopupMenu (_menu, p);
 }
@@ -120,7 +136,7 @@ ContentMenu::join ()
 		}
 	}
 
-	assert (fc.size() > 1);
+	DCPOMATIC_ASSERT (fc.size() > 1);
 
 	shared_ptr<Film> film = _film.lock ();
 	if (!film) {
@@ -206,6 +222,19 @@ ContentMenu::find_missing ()
 	JobManager::instance()->add (j);
 }
 
+void
+ContentMenu::re_examine ()
+{
+	shared_ptr<Film> film = _film.lock ();
+	if (!film) {
+		return;
+	}
+
+	for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) {
+		film->examine_content (*i);
+	}
+}
+
 void
 ContentMenu::maybe_found_missing (weak_ptr<Job> j, weak_ptr<Content> oc, weak_ptr<Content> nc)
 {
@@ -216,8 +245,8 @@ ContentMenu::maybe_found_missing (weak_ptr<Job> j, weak_ptr<Content> oc, weak_pt
 
 	shared_ptr<Content> old_content = oc.lock ();
 	shared_ptr<Content> new_content = nc.lock ();
-	assert (old_content);
-	assert (new_content);
+	DCPOMATIC_ASSERT (old_content);
+	DCPOMATIC_ASSERT (new_content);
 
 	if (new_content->digest() != old_content->digest()) {
 		error_dialog (0, _("The content file(s) you specified are not the same as those that are missing.  Either try again with the correct content file or remove the missing content."));
@@ -226,3 +255,22 @@ ContentMenu::maybe_found_missing (weak_ptr<Job> j, weak_ptr<Content> oc, weak_pt
 
 	old_content->set_path (new_content->path (0));
 }
+
+void
+ContentMenu::kdm ()
+{
+	DCPOMATIC_ASSERT (!_content.empty ());
+	shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (_content.front ());
+	DCPOMATIC_ASSERT (dcp);
+	
+	wxFileDialog* d = new wxFileDialog (_parent, _("Select KDM"));
+		
+	if (d->ShowModal() == wxID_OK) {
+		dcp->add_kdm (dcp::EncryptedKDM (dcp::file_to_string (wx_to_std (d->GetPath ()))));
+		shared_ptr<Film> film = _film.lock ();
+		DCPOMATIC_ASSERT (film);
+		film->examine_content (dcp);
+	}
+	
+	d->Destroy ();
+}