diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-10-11 19:57:22 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-10-11 19:57:22 +0100 |
| commit | b55c6c5496f6c8248dd51bbcaecb80ef0efcbadb (patch) | |
| tree | 0ccd243f9024e9dbee99dd43672cd3f7ecb4f79a /src/lib | |
| parent | e90a898fd817f3a419134082ce390d66925c2fa4 (diff) | |
Fix crash on opening content menu for DCPs that have had incorrect KDMs added.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/dcp_examiner.cc | 4 | ||||
| -rw-r--r-- | src/lib/film.cc | 7 | ||||
| -rw-r--r-- | src/lib/film.h | 1 |
3 files changed, 0 insertions, 12 deletions
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 @@ -1028,13 +1028,6 @@ Film::content () const } 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) { if (dynamic_pointer_cast<FFmpegContent> (c) && _directory) { 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>); |