X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_decoder.cc;h=e8c64a086012742e1fe3c4fe3c8bfe3320ece87c;hb=6f344b876689a1234a5eb75041882f06f5d9fe5c;hp=ae2f8ef9fe19c2d7d0d5e2509de0240295bdff43;hpb=2284f338b5de4e0f6d497404d2fb5e5f11b6fd56;p=dcpomatic.git

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index ae2f8ef9f..e8c64a086 100644
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -42,14 +42,14 @@ using std::cout;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 
-DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c, bool fast)
-	: VideoDecoder (c)
+DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c, shared_ptr<Log> log, bool fast)
+	: VideoDecoder (c->video, log)
 	, AudioDecoder (c, fast)
 	, SubtitleDecoder (c)
 	, _dcp_content (c)
 {
 	dcp::DCP dcp (c->directory ());
-	dcp.read ();
+	dcp.read (false, 0, true);
 	if (c->kdm ()) {
 		dcp.add (dcp::DecryptedKDM (c->kdm().get (), Config::instance()->decryption_chain()->key().get ()));
 	}
@@ -73,7 +73,7 @@ DCPDecoder::pass (PassReason reason, bool)
 		++i;
 	}
 
-	double const vfr = _dcp_content->video_frame_rate ();
+	double const vfr = _dcp_content->video->video_frame_rate ();
 
 	/* Frame within the (played part of the) reel that is coming up next */
 	int64_t const frame = _next.frames_round (vfr);
@@ -156,8 +156,8 @@ DCPDecoder::seek (ContentTime t, bool accurate)
 	SubtitleDecoder::seek (t, accurate);
 
 	_reel = _reels.begin ();
-	while (_reel != _reels.end() && t >= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->video_frame_rate ())) {
-		t -= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->video_frame_rate ());
+	while (_reel != _reels.end() && t >= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->video->video_frame_rate ())) {
+		t -= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->video->video_frame_rate ());
 		++_reel;
 	}
 
@@ -177,7 +177,7 @@ DCPDecoder::text_subtitles_during (ContentTimePeriod period, bool starting) cons
 	/* XXX: inefficient */
 
 	list<ContentTimePeriod> ctp;
-	double const vfr = _dcp_content->video_frame_rate ();
+	double const vfr = _dcp_content->video->video_frame_rate ();
 
 	BOOST_FOREACH (shared_ptr<dcp::Reel> r, _reels) {
 		if (!r->main_subtitle ()) {