diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-04-12 16:43:45 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-18 11:50:29 +0100 |
| commit | 36774ee2b48f0bfde43b743592e5816ff58bb7d2 (patch) | |
| tree | 1974d8e7e1b05338429bd40da57092d6e5a0e59a /src/lib/dcp_decoder.cc | |
| parent | 3ef438f90729d78ad579bbeb7933b3cf4f09c10c (diff) | |
Innocuous build fixes.
Diffstat (limited to 'src/lib/dcp_decoder.cc')
| -rw-r--r-- | src/lib/dcp_decoder.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc index f58577c8c..873b3634f 100644 --- a/src/lib/dcp_decoder.cc +++ b/src/lib/dcp_decoder.cc @@ -43,7 +43,7 @@ using boost::shared_ptr; using boost::dynamic_pointer_cast; DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c, bool fast) - : VideoDecoder (c) + : VideoDecoder (c->video) , AudioDecoder (c, fast) , SubtitleDecoder (c) , _dcp_content (c) @@ -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 ()) { |