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/string_text_file_content.cc | |
| parent | c31b9542c58ae1cbfae7ec3ba4911359fd010ba2 (diff) | |
Take Film pointer out of Content.
Diffstat (limited to 'src/lib/string_text_file_content.cc')
| -rw-r--r-- | src/lib/string_text_file_content.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/string_text_file_content.cc b/src/lib/string_text_file_content.cc index 9c941c2bb..35f76be7c 100644 --- a/src/lib/string_text_file_content.cc +++ b/src/lib/string_text_file_content.cc @@ -36,23 +36,23 @@ using boost::shared_ptr; using boost::optional; using dcp::raw_convert; -StringTextFileContent::StringTextFileContent (shared_ptr<const Film> film, boost::filesystem::path path) - : Content (film, path) +StringTextFileContent::StringTextFileContent (boost::filesystem::path path) + : Content (path) { text.push_back (shared_ptr<TextContent> (new TextContent (this, TEXT_OPEN_SUBTITLE, TEXT_UNKNOWN))); } -StringTextFileContent::StringTextFileContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version) - : Content (film, node) +StringTextFileContent::StringTextFileContent (cxml::ConstNodePtr node, int version) + : Content (node) , _length (node->number_child<ContentTime::Type> ("Length")) { text = TextContent::from_xml (this, node, version); } void -StringTextFileContent::examine (boost::shared_ptr<Job> job) +StringTextFileContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job) { - Content::examine (job); + Content::examine (film, job); StringTextFile s (shared_from_this ()); /* Default to turning these subtitles on */ @@ -89,8 +89,8 @@ StringTextFileContent::as_xml (xmlpp::Node* node, bool with_paths) const } DCPTime -StringTextFileContent::full_length () const +StringTextFileContent::full_length (shared_ptr<const Film> film) const { - FrameRateChange const frc (active_video_frame_rate(), film()->video_frame_rate ()); + FrameRateChange const frc (active_video_frame_rate(film), film->video_frame_rate()); return DCPTime (_length, frc); } |