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/image_content.cc | |
| parent | 826ed68a1e34ce158342da324ff7203af0449641 (diff) | |
Rename video/audio/subtitle part methods.
Diffstat (limited to 'src/lib/image_content.cc')
| -rw-r--r-- | src/lib/image_content.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc index 231eb9f8c..29af451b7 100644 --- a/src/lib/image_content.cc +++ b/src/lib/image_content.cc @@ -115,7 +115,7 @@ ImageContent::examine (shared_ptr<Job> job) DCPOMATIC_ASSERT (film); shared_ptr<ImageExaminer> examiner (new ImageExaminer (film, shared_from_this(), job)); - video->take_from_video_examiner (examiner); + video->take_from_examiner (examiner); set_default_colour_conversion (); } @@ -124,8 +124,8 @@ ImageContent::full_length () const { shared_ptr<const Film> film = _film.lock (); DCPOMATIC_ASSERT (film); - FrameRateChange const frc (video->video_frame_rate(), film->video_frame_rate()); - return DCPTime::from_frames (llrint (video->video_length_after_3d_combine() * frc.factor ()), film->video_frame_rate ()); + FrameRateChange const frc (video->frame_rate(), film->video_frame_rate()); + return DCPTime::from_frames (llrint (video->length_after_3d_combine() * frc.factor ()), film->video_frame_rate ()); } string @@ -134,7 +134,7 @@ ImageContent::identifier () const SafeStringStream s; s << Content::identifier(); s << "_" << video->identifier (); - s << "_" << video->video_length(); + s << "_" << video->length(); return s.str (); } |