diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-05-13 14:43:27 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-18 11:50:29 +0100 |
| commit | 29fe2d3a4c347e15b987f9e61e56d22a21d4678f (patch) | |
| tree | 910b7afc8a109733edd76befc0d17e9be902fb1b /src/lib/dcp_content.cc | |
| parent | 640a1ef73e575fe891a420dec392dace8b1a0255 (diff) | |
Remove unnecessary Film variable in ContentPart.
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 83374fc30..b28e91dd5 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -62,8 +62,8 @@ DCPContent::DCPContent (shared_ptr<const Film> film, boost::filesystem::path p) , _reference_audio (false) , _reference_subtitle (false) { - video.reset (new VideoContent (this, film)); - audio.reset (new AudioContent (this, film)); + video.reset (new VideoContent (this)); + audio.reset (new AudioContent (this)); read_directory (p); set_default_colour_conversion (); @@ -72,9 +72,9 @@ DCPContent::DCPContent (shared_ptr<const Film> film, boost::filesystem::path p) DCPContent::DCPContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version) : Content (film, node) { - video = VideoContent::from_xml (this, film, node, version); - audio = AudioContent::from_xml (this, film, node); - subtitle = SubtitleContent::from_xml (this, film, node, version); + video = VideoContent::from_xml (this, node, version); + audio = AudioContent::from_xml (this, node); + subtitle = SubtitleContent::from_xml (this, node, version); audio->set_stream ( AudioStreamPtr ( @@ -138,7 +138,7 @@ DCPContent::examine (shared_ptr<Job> job) boost::mutex::scoped_lock lm (_mutex); _name = examiner->name (); if (examiner->has_subtitles ()) { - subtitle.reset (new SubtitleContent (this, film())); + subtitle.reset (new SubtitleContent (this)); } _encrypted = examiner->encrypted (); _kdm_valid = examiner->kdm_valid (); |