X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Fcontent_menu.cc;h=ec966b81a5ac9e95bcfa4e32a15eb590d3da19b6;hb=dda7d841eac2305379aa86d11249dbb4b98d5bb7;hp=d28253c6a1b88dfef97426534ecbf8e70ae1fa1f;hpb=4873cbc567d2c97c6587ab624e4c53abcd23cf23;p=dcpomatic.git

diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index d28253c6a..ec966b81a 100644
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -24,6 +24,7 @@
 #include "timeline_video_content_view.h"
 #include "timeline_audio_content_view.h"
 #include "content_properties_dialog.h"
+#include "content_advanced_dialog.h"
 #include "lib/playlist.h"
 #include "lib/film.h"
 #include "lib/image_content.h"
@@ -51,6 +52,7 @@ using std::list;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
+using boost::optional;
 
 enum {
 	/* Start at 256 so we can have IDs on _cpl_menu from 1 to 255 */
@@ -58,6 +60,7 @@ enum {
 	ID_join,
 	ID_find_missing,
 	ID_properties,
+	ID_advanced,
 	ID_re_examine,
 	ID_kdm,
 	ID_ov,
@@ -75,6 +78,7 @@ ContentMenu::ContentMenu (wxWindow* p)
 	_join = _menu->Append (ID_join, _("Join"));
 	_find_missing = _menu->Append (ID_find_missing, _("Find missing..."));
 	_properties = _menu->Append (ID_properties, _("Properties..."));
+	_advanced = _menu->Append (ID_advanced, _("Advanced settings..."));
 	_re_examine = _menu->Append (ID_re_examine, _("Re-examine..."));
 	_menu->AppendSeparator ();
 	_kdm = _menu->Append (ID_kdm, _("Add KDM..."));
@@ -89,6 +93,7 @@ ContentMenu::ContentMenu (wxWindow* p)
 	_parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::join, this), ID_join);
 	_parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::find_missing, this), ID_find_missing);
 	_parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::properties, this), ID_properties);
+	_parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::advanced, this), ID_advanced);
 	_parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::re_examine, this), ID_re_examine);
 	_parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::kdm, this), ID_kdm);
 	_parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::ov, this), ID_ov);
@@ -122,6 +127,7 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList
 
 	_find_missing->Enable (_content.size() == 1 && !_content.front()->paths_valid ());
 	_properties->Enable (_content.size() == 1);
+	_advanced->Enable (_content.size() == 1);
 	_re_examine->Enable (!_content.empty ());
 
 	if (_content.size() == 1) {
@@ -400,14 +406,38 @@ ContentMenu::kdm ()
 	wxFileDialog* d = new wxFileDialog (_parent, _("Select KDM"));
 
 	if (d->ShowModal() == wxID_OK) {
+		optional<dcp::EncryptedKDM> kdm;
 		try {
-			dcp->add_kdm (dcp::EncryptedKDM (dcp::file_to_string (wx_to_std (d->GetPath ()), MAX_KDM_SIZE)));
+			kdm = dcp::EncryptedKDM (dcp::file_to_string(wx_to_std(d->GetPath()), MAX_KDM_SIZE));
 		} catch (exception& e) {
 			error_dialog (_parent, _("Could not load KDM"), std_to_wx(e.what()));
 			d->Destroy ();
 			return;
 		}
 
+		DCPExaminer ex (dcp, true);
+
+		bool kdm_matches_any_cpl = false;
+		BOOST_FOREACH (shared_ptr<dcp::CPL> i, ex.cpls()) {
+			if (i->id() == kdm->cpl_id()) {
+				kdm_matches_any_cpl = true;
+			}
+		}
+
+
+		bool kdm_matches_selected_cpl = dcp->cpl() || kdm->cpl_id() == dcp->cpl().get();
+
+		if (!kdm_matches_any_cpl) {
+			error_dialog (_parent, _("This KDM was not made for this DCP.  You will need a different one."));
+			return;
+		}
+
+		if (!kdm_matches_selected_cpl && kdm_matches_any_cpl) {
+			message_dialog (_parent, _("This KDM was made for one of the CPLs in this DCP, but not the currently selected one.  To play the currently-selected CPL you will need a different KDM."));
+		}
+
+		dcp->add_kdm (*kdm);
+
 		shared_ptr<Film> film = _film.lock ();
 		DCPOMATIC_ASSERT (film);
 		JobManager::instance()->add (shared_ptr<Job> (new ExamineContentJob (film, dcp)));
@@ -445,6 +475,16 @@ ContentMenu::properties ()
 	d->Destroy ();
 }
 
+
+void
+ContentMenu::advanced ()
+{
+	ContentAdvancedDialog* d = new ContentAdvancedDialog (_parent, _content.front());
+	d->ShowModal ();
+	d->Destroy ();
+}
+
+
 void
 ContentMenu::cpl_selected (wxCommandEvent& ev)
 {