diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-11-21 01:59:04 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-11-21 01:59:04 +0000 |
| commit | 254b3044d72de6b033d7c584f5abd2b9aa70aad5 (patch) | |
| tree | 8a5c83c1b2dea690672663dedb2f3aa50f4473dc /src/lib/video_mxf_content.cc | |
| parent | c31b9542c58ae1cbfae7ec3ba4911359fd010ba2 (diff) | |
Take Film pointer out of Content.
Diffstat (limited to 'src/lib/video_mxf_content.cc')
| -rw-r--r-- | src/lib/video_mxf_content.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/video_mxf_content.cc b/src/lib/video_mxf_content.cc index 8e762ae14..4f69cb2e2 100644 --- a/src/lib/video_mxf_content.cc +++ b/src/lib/video_mxf_content.cc @@ -36,14 +36,14 @@ using std::list; using std::string; using boost::shared_ptr; -VideoMXFContent::VideoMXFContent (shared_ptr<const Film> film, boost::filesystem::path path) - : Content (film, path) +VideoMXFContent::VideoMXFContent (boost::filesystem::path path) + : Content (path) { } -VideoMXFContent::VideoMXFContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version) - : Content (film, node) +VideoMXFContent::VideoMXFContent (cxml::ConstNodePtr node, int version) + : Content (node) { video = VideoContent::from_xml (this, node, version); } @@ -78,11 +78,11 @@ VideoMXFContent::valid_mxf (boost::filesystem::path path) } void -VideoMXFContent::examine (shared_ptr<Job> job) +VideoMXFContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job) { job->set_progress_unknown (); - Content::examine (job); + Content::examine (film, job); video.reset (new VideoContent (this)); shared_ptr<VideoMXFExaminer> examiner (new VideoMXFExaminer (shared_from_this ())); @@ -117,10 +117,10 @@ VideoMXFContent::as_xml (xmlpp::Node* node, bool with_paths) const } DCPTime -VideoMXFContent::full_length () const +VideoMXFContent::full_length (shared_ptr<const Film> film) const { - FrameRateChange const frc (active_video_frame_rate(), film()->video_frame_rate()); - return DCPTime::from_frames (llrint (video->length_after_3d_combine() * frc.factor()), film()->video_frame_rate()); + FrameRateChange const frc (active_video_frame_rate(film), film->video_frame_rate()); + return DCPTime::from_frames (llrint (video->length_after_3d_combine() * frc.factor()), film->video_frame_rate()); } void |