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/subtitle_content.cc | |
| parent | 640a1ef73e575fe891a420dec392dace8b1a0255 (diff) | |
Remove unnecessary Film variable in ContentPart.
Diffstat (limited to 'src/lib/subtitle_content.cc')
| -rw-r--r-- | src/lib/subtitle_content.cc | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc index 89953b0e5..01db0cee6 100644 --- a/src/lib/subtitle_content.cc +++ b/src/lib/subtitle_content.cc @@ -24,7 +24,6 @@ #include "font.h" #include "raw_convert.h" #include "content.h" -#include "film.h" #include <libcxml/cxml.h> #include <libxml++/libxml++.h> #include <boost/foreach.hpp> @@ -51,8 +50,8 @@ int const SubtitleContentProperty::COLOUR = 508; int const SubtitleContentProperty::OUTLINE = 509; int const SubtitleContentProperty::OUTLINE_COLOUR = 510; -SubtitleContent::SubtitleContent (Content* parent, shared_ptr<const Film> film) - : ContentPart (parent, film) +SubtitleContent::SubtitleContent (Content* parent) + : ContentPart (parent) , _use (false) , _burn (false) , _x_offset (0) @@ -67,17 +66,17 @@ SubtitleContent::SubtitleContent (Content* parent, shared_ptr<const Film> film) } shared_ptr<SubtitleContent> -SubtitleContent::from_xml (Content* parent, shared_ptr<const Film> film, cxml::ConstNodePtr node, int version) +SubtitleContent::from_xml (Content* parent, cxml::ConstNodePtr node, int version) { if (!node->optional_number_child<double>("SubtitleXOffset") && !node->optional_number_child<double>("SubtitleOffset")) { return shared_ptr<SubtitleContent> (); } - return shared_ptr<SubtitleContent> (new SubtitleContent (parent, film, node, version)); + return shared_ptr<SubtitleContent> (new SubtitleContent (parent, node, version)); } -SubtitleContent::SubtitleContent (Content* parent, shared_ptr<const Film> film, cxml::ConstNodePtr node, int version) - : ContentPart (parent, film) +SubtitleContent::SubtitleContent (Content* parent, cxml::ConstNodePtr node, int version) + : ContentPart (parent) , _use (false) , _burn (false) , _x_offset (0) @@ -125,8 +124,8 @@ SubtitleContent::SubtitleContent (Content* parent, shared_ptr<const Film> film, connect_to_fonts (); } -SubtitleContent::SubtitleContent (Content* parent, shared_ptr<const Film> film, vector<shared_ptr<Content> > c) - : ContentPart (parent, film) +SubtitleContent::SubtitleContent (Content* parent, vector<shared_ptr<Content> > c) + : ContentPart (parent) { shared_ptr<SubtitleContent> ref = c[0]->subtitle; DCPOMATIC_ASSERT (ref); |