Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index 21ffeda296c503edb0d9af6c76aec737a335c3ec..fe2660d48508834c38f9b6c678c5259d3d9162cd 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,6 +33,7 @@
 #include <dcp/stereo_picture_asset.h>
 #include <dcp/stereo_picture_frame.h>
 #include <dcp/sound_asset.h>
+#include <iostream>
 
 #include "i18n.h"
 
@@ -51,7 +53,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) {
@@ -83,7 +85,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
 
                        _video_length += (*i)->main_picture()->duration();
                }
-                       
+
                if ((*i)->main_sound ()) {
                        shared_ptr<dcp::SoundAsset> asset = (*i)->main_sound()->asset ();
 
@@ -109,26 +111,26 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
 
        _encrypted = dcp.encrypted ();
        _kdm_valid = true;
-       
+
        /* Check that we can read the first picture frame */
        try {
                if (!dcp.cpls().empty () && !dcp.cpls().front()->reels().empty ()) {
                        shared_ptr<dcp::PictureAsset> asset = dcp.cpls().front()->reels().front()->main_picture()->asset ();
                        shared_ptr<dcp::MonoPictureAsset> mono = dynamic_pointer_cast<dcp::MonoPictureAsset> (asset);
                        shared_ptr<dcp::StereoPictureAsset> stereo = dynamic_pointer_cast<dcp::StereoPictureAsset> (asset);
-                       
+
                        if (mono) {
                                mono->get_frame(0)->xyz_image ();
                        } else {
                                stereo->get_frame(0)->xyz_image (dcp::EYE_LEFT);
                        }
-                       
+
                }
        } catch (dcp::DCPReadError& e) {
                _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 StringError (_("The KDM does not decrypt the DCP.  Perhaps it is targeted at the wrong CPL."));
                }
        }
 }