Allow content parts to not be preset in XML.

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

diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index 1dd469206063d737ac216686c4ac827b9f69d968..81cb98b986b4ad09236d31eb28f1b26bb34c45d9 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;
 
@@ -48,10 +51,10 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
        , _kdm_valid (false)
 {
        dcp::DCP dcp (content->directory ());
-       dcp.read ();
+       dcp.read (false, 0, true);
 
        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) {
@@ -96,7 +99,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
                        if (!_audio_frame_rate) {
                                _audio_frame_rate = asset->sampling_rate ();
                        } else if (_audio_frame_rate.get() != asset->sampling_rate ()) {
-                               throw DCPError (_("Mismatched audio frame rates in DCP"));
+                               throw DCPError (_("Mismatched audio sample rates in DCP"));
                        }
 
                        _audio_length += (*i)->main_sound()->duration();
@@ -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."));
                }
        }
 }