X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_menu.cc;h=e5cadd7942870f90512d57f2320fc1cd2f2e7a88;hb=63c1bbc1ba177600523b2257223070cc2dbde7b7;hp=f332dbe910744c49a6dedbaa556467cb602c9c8e;hpb=9981fe99124d50239c90d26ed9251a7eaf4f21d9;p=dcpomatic.git

diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index f332dbe91..e5cadd794 100644
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -35,6 +35,7 @@
 #include "lib/dcp_examiner.h"
 #include "lib/ffmpeg_content.h"
 #include "lib/audio_content.h"
+#include "lib/config.h"
 #include <dcp/cpl.h>
 #include <dcp/exceptions.h>
 #include <wx/wx.h>
@@ -66,6 +67,7 @@ enum {
 ContentMenu::ContentMenu (wxWindow* p)
 	: _menu (new wxMenu)
 	, _parent (p)
+	, _pop_up_open (false)
 {
 	_repeat = _menu->Append (ID_repeat, _("Repeat..."));
 	_join = _menu->Append (ID_join, _("Join"));
@@ -130,7 +132,7 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList
 				/* We can't have 0 as a menu item ID on OS X */
 				int id = 1;
 				BOOST_FOREACH (shared_ptr<dcp::CPL> i, cpls) {
-					wxMenuItem* item = _cpl_menu->AppendCheckItem (
+					wxMenuItem* item = _cpl_menu->AppendRadioItem (
 						id++,
 						wxString::Format (
 							"%s (%s)",
@@ -140,8 +142,12 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList
 						);
 					item->Check (dcp->cpl() && dcp->cpl() == i->id());
 				}
-			} catch (dcp::DCPReadError) {
+			} catch (dcp::DCPReadError &) {
 				/* The DCP is probably missing */
+			} catch (dcp::KDMDecryptionError &) {
+				/* We have an incorrect KDM */
+			} catch (KDMError &) {
+				/* We have an incorrect KDM */
 			}
 		} else {
 			_kdm->Enable (false);
@@ -154,7 +160,9 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList
 
 	_remove->Enable (!_content.empty ());
 
+	_pop_up_open = true;
 	_parent->PopupMenu (_menu, p);
+	_pop_up_open = false;
 }
 
 void
@@ -201,7 +209,7 @@ ContentMenu::join ()
 	}
 
 	try {
-		shared_ptr<FFmpegContent> joined (new FFmpegContent (film, fc));
+		shared_ptr<FFmpegContent> joined (new FFmpegContent(fc));
 		film->remove_content (_content);
 		film->examine_and_add_content (joined);
 	} catch (JoinError& e) {
@@ -275,8 +283,6 @@ ContentMenu::find_missing ()
 		return;
 	}
 
-	shared_ptr<Content> content;
-
 	/* XXX: a bit nasty */
 	shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (_content.front ());
 	shared_ptr<DCPContent> dc = dynamic_pointer_cast<DCPContent> (_content.front ());
@@ -296,27 +302,35 @@ ContentMenu::find_missing ()
 		d->Destroy ();
 	}
 
+	list<shared_ptr<Content> > content;
+
 	if (r == wxID_OK) {
-		content = content_factory (film, path);
+		if (dc) {
+			content.push_back (shared_ptr<DCPContent>(new DCPContent(path)));
+		} else {
+			content = content_factory (path);
+		}
 	}
 
-	if (!content) {
+	if (content.empty ()) {
 		return;
 	}
 
-	shared_ptr<Job> j (new ExamineContentJob (film, content));
+	BOOST_FOREACH (shared_ptr<Content> i, content) {
+		shared_ptr<Job> j (new ExamineContentJob (film, i));
 
-	j->Finished.connect (
-		bind (
-			&ContentMenu::maybe_found_missing,
-			this,
-			boost::weak_ptr<Job> (j),
-			boost::weak_ptr<Content> (_content.front ()),
-			boost::weak_ptr<Content> (content)
-			)
-		);
+		j->Finished.connect (
+			bind (
+				&ContentMenu::maybe_found_missing,
+				this,
+				boost::weak_ptr<Job> (j),
+				boost::weak_ptr<Content> (_content.front ()),
+				boost::weak_ptr<Content> (i)
+				)
+			);
 
-	JobManager::instance()->add (j);
+		JobManager::instance()->add (j);
+	}
 }
 
 void
@@ -350,7 +364,7 @@ ContentMenu::maybe_found_missing (weak_ptr<Job> j, weak_ptr<Content> oc, weak_pt
 		return;
 	}
 
-	old_content->set_path (new_content->path (0));
+	old_content->set_paths (new_content->paths());
 }
 
 void
@@ -364,9 +378,9 @@ ContentMenu::kdm ()
 
 	if (d->ShowModal() == wxID_OK) {
 		try {
-			dcp->add_kdm (dcp::EncryptedKDM (dcp::file_to_string (wx_to_std (d->GetPath ()))));
+			dcp->add_kdm (dcp::EncryptedKDM (dcp::file_to_string (wx_to_std (d->GetPath ()), MAX_KDM_SIZE)));
 		} catch (exception& e) {
-			error_dialog (_parent, wxString::Format (_("Could not load KDM (%s)"), e.what ()));
+			error_dialog (_parent, _("Could not load KDM"), std_to_wx(e.what()));
 			d->Destroy ();
 			return;
 		}
@@ -401,7 +415,9 @@ ContentMenu::ov ()
 void
 ContentMenu::properties ()
 {
-	ContentPropertiesDialog* d = new ContentPropertiesDialog (_parent, _content.front ());
+	shared_ptr<Film> film = _film.lock ();
+	DCPOMATIC_ASSERT (film);
+	ContentPropertiesDialog* d = new ContentPropertiesDialog (_parent, film, _content.front());
 	d->ShowModal ();
 	d->Destroy ();
 }
@@ -409,6 +425,10 @@ ContentMenu::properties ()
 void
 ContentMenu::cpl_selected (wxCommandEvent& ev)
 {
+	if (!_pop_up_open) {
+		return;
+	}
+
 	DCPOMATIC_ASSERT (!_content.empty ());
 	shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (_content.front ());
 	DCPOMATIC_ASSERT (dcp);