X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_menu.cc;h=c5dc1606d790bb577a0a5ba5382b218febc45867;hb=b24104d631b8c6f44d95f28e2ff3bc608cb221a7;hp=36187e00f307849308577fec31f512e7ee06171a;hpb=5c9e39df078aab9f03ae186d0758d4d710f90bab;p=dcpomatic.git

diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 36187e00f..c5dc1606d 100644
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -126,13 +126,13 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList
 			_kdm->Enable (dcp->encrypted ());
 			_ov->Enable (dcp->needs_assets ());
 			try {
-				DCPExaminer ex (dcp);
+				DCPExaminer ex (dcp, true);
 				list<shared_ptr<dcp::CPL> > cpls = ex.cpls ();
 				_choose_cpl->Enable (cpls.size() > 1);
 				/* 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)",
@@ -142,11 +142,11 @@ 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) {
+			} catch (dcp::KDMDecryptionError &) {
 				/* We have an incorrect KDM */
-			} catch (KDMError) {
+			} catch (KDMError &) {
 				/* We have an incorrect KDM */
 			}
 		} else {
@@ -209,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) {
@@ -306,9 +306,9 @@ ContentMenu::find_missing ()
 
 	if (r == wxID_OK) {
 		if (dc) {
-			content.push_back (shared_ptr<DCPContent> (new DCPContent (film, path)));
+			content.push_back (shared_ptr<DCPContent>(new DCPContent(path)));
 		} else {
-			content = content_factory (film, path);
+			content = content_factory (path);
 		}
 	}
 
@@ -415,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 ();
 }
@@ -431,7 +433,7 @@ ContentMenu::cpl_selected (wxCommandEvent& ev)
 	shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (_content.front ());
 	DCPOMATIC_ASSERT (dcp);
 
-	DCPExaminer ex (dcp);
+	DCPExaminer ex (dcp, true);
 	list<shared_ptr<dcp::CPL> > cpls = ex.cpls ();
 	DCPOMATIC_ASSERT (ev.GetId() > 0);
 	DCPOMATIC_ASSERT (ev.GetId() <= int (cpls.size()));