#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>
#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;
, _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) {
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();
_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."));
}
}
}