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_content.cc | |
| parent | 3ef438f90729d78ad579bbeb7933b3cf4f09c10c (diff) | |
Innocuous build fixes.
Diffstat (limited to 'src/lib/dcp_content.cc')
| -rw-r--r-- | src/lib/dcp_content.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index 5bd6e1e33..3bc28598d 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -106,7 +106,7 @@ DCPContent::examine (shared_ptr<Job> job) Content::examine (job); shared_ptr<DCPExaminer> examiner (new DCPExaminer (shared_from_this ())); - take_from_video_examiner (examiner); + video->take_from_video_examiner (examiner); set_default_colour_conversion (); take_from_audio_examiner (examiner); @@ -164,7 +164,7 @@ DCPContent::as_xml (xmlpp::Node* node) const DCPTime DCPContent::full_length () const { - FrameRateChange const frc (video_frame_rate (), film()->video_frame_rate ()); + FrameRateChange const frc (video->video_frame_rate (), film()->video_frame_rate ()); return DCPTime::from_frames (llrint (video_length () * frc.factor ()), film()->video_frame_rate ()); } @@ -217,7 +217,7 @@ void DCPContent::set_default_colour_conversion () { /* Default to no colour conversion for DCPs */ - unset_colour_conversion (); + video->unset_colour_conversion (); } void @@ -344,3 +344,9 @@ DCPContent::can_reference_subtitle (list<string>& why_not) const return can_reference<SubtitleContent> (_("There is other subtitle content overlapping this DCP; remove it."), why_not); } + +double +DCPContent::subtitle_video_frame_rate () const +{ + return video->video_frame_rate (); +} |