Clean up a bit by using Content::film() more.

[dcpomatic.git] / src / lib / dcp_examiner.cc

diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index 633e8e9d77a56409c89b7e41f3bfc172c8f12792..22b10ab84182f1890eb80804c29a2f97d98be6a0 100644 (file)
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -23,6 +23,7 @@
 #include "image.h"
 #include "config.h"
 #include <dcp/dcp.h>
+#include <dcp/decrypted_kdm.h>
 #include <dcp/cpl.h>
 #include <dcp/reel.h>
 #include <dcp/reel_picture_asset.h>
@@ -32,11 +33,13 @@
 #include <dcp/stereo_picture_asset.h>
 #include <dcp/stereo_picture_frame.h>
 #include <dcp/sound_asset.h>
+#include <iostream>
 
 #include "i18n.h"
 
 using std::list;
 using std::cout;
+using std::runtime_error;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 
@@ -51,7 +54,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
        dcp.read ();
 
        if (content->kdm ()) {
-               dcp.add (dcp::DecryptedKDM (content->kdm().get(), Config::instance()->decryption_private_key ()));
+               dcp.add (dcp::DecryptedKDM (content->kdm().get(), Config::instance()->decryption_chain()->key().get ()));
        }
 
        if (dcp.cpls().size() == 0) {
@@ -128,7 +131,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
                _kdm_valid = false;
                if (_encrypted && content->kdm ()) {
                        /* XXX: maybe don't use an exception for this */
-                       throw StringError (_("The KDM does not decrypt the DCP.  Perhaps it is targeted at the wrong CPL."));
+                       throw runtime_error (_("The KDM does not decrypt the DCP.  Perhaps it is targeted at the wrong CPL."));
                }
        }
 }