diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-04-14 02:06:18 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-18 11:50:29 +0100 |
| commit | 2d5beb0d6794df13ad1df47e84fd7a57d1d1c64d (patch) | |
| tree | 70034dc6789e55394dac0ec87b968c58b96e4b48 /src/lib/dcp_content.cc | |
| parent | 826ed68a1e34ce158342da324ff7203af0449641 (diff) | |
Rename video/audio/subtitle part methods.
Diffstat (limited to 'src/lib/dcp_content.cc')
| -rw-r--r-- | src/lib/dcp_content.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index cfd19fe31..d47c52273 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -116,7 +116,7 @@ DCPContent::examine (shared_ptr<Job> job) Content::examine (job); shared_ptr<DCPExaminer> examiner (new DCPExaminer (shared_from_this ())); - video->take_from_video_examiner (examiner); + video->take_from_examiner (examiner); set_default_colour_conversion (); { @@ -129,7 +129,7 @@ DCPContent::examine (shared_ptr<Job> job) as->set_mapping (m); } - signal_changed (AudioContentProperty::AUDIO_STREAMS); + signal_changed (AudioContentProperty::STREAMS); { boost::mutex::scoped_lock lm (_mutex); @@ -187,8 +187,8 @@ DCPContent::as_xml (xmlpp::Node* node) const DCPTime DCPContent::full_length () const { - FrameRateChange const frc (video->video_frame_rate (), film()->video_frame_rate ()); - return DCPTime::from_frames (llrint (video->video_length () * frc.factor ()), film()->video_frame_rate ()); + FrameRateChange const frc (video->frame_rate (), film()->video_frame_rate ()); + return DCPTime::from_frames (llrint (video->length () * frc.factor ()), film()->video_frame_rate ()); } string @@ -358,7 +358,7 @@ DCPContent::can_reference_subtitle (list<string>& why_not) const void DCPContent::changed (int property) { - if (property == VideoContentProperty::VIDEO_FRAME_RATE && subtitle) { - subtitle->set_subtitle_video_frame_rate (video->video_frame_rate ()); + if (property == VideoContentProperty::FRAME_RATE && subtitle) { + subtitle->set_video_frame_rate (video->frame_rate ()); } } |