From b55c6c5496f6c8248dd51bbcaecb80ef0efcbadb Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 11 Oct 2016 19:57:22 +0100
Subject: Fix crash on opening content menu for DCPs that have had incorrect
 KDMs added.

---
 src/lib/dcp_examiner.cc | 4 ----
 src/lib/film.cc         | 7 -------
 src/lib/film.h          | 1 -
 3 files changed, 12 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index e25583cb6..74640ff00 100644
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -192,10 +192,6 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
 		}
 	} catch (dcp::DCPReadError& e) {
 		_kdm_valid = false;
-		if (_encrypted && content->kdm ()) {
-			/* XXX: maybe don't use an exception for this */
-			throw runtime_error (_("The KDM does not decrypt the DCP.  Perhaps it is targeted at the wrong CPL."));
-		}
 	}
 
 	DCPOMATIC_ASSERT (cpl->standard ());
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 13a03d929..1a1957d33 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -1027,13 +1027,6 @@ Film::content () const
 	return _playlist->content ();
 }
 
-void
-Film::examine_content (shared_ptr<Content> c)
-{
-	shared_ptr<Job> j (new ExamineContentJob (shared_from_this(), c));
-	JobManager::instance()->add (j);
-}
-
 void
 Film::examine_and_add_content (shared_ptr<Content> c)
 {
diff --git a/src/lib/film.h b/src/lib/film.h
index 5fa35b065..ad94852a2 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -289,7 +289,6 @@ public:
 	void set_directory (boost::filesystem::path);
 	void set_name (std::string);
 	void set_use_isdcf_name (bool);
-	void examine_content (boost::shared_ptr<Content>);
 	void examine_and_add_content (boost::shared_ptr<Content>);
 	void add_content (boost::shared_ptr<Content>);
 	void remove_content (boost::shared_ptr<Content>);
-- 
cgit v1.2.3