diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-05-10 13:22:35 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-18 11:50:29 +0100 |
| commit | cc76b517f6a74f813ae38137bdc88ff3bafa6dd9 (patch) | |
| tree | 34c2960763f897936efef689898a1f392fb38375 /src/lib/subtitle_content.h | |
| parent | a3073b3059e8df6304d2936ab2c605e6908a7373 (diff) | |
Allow content parts to not be preset in XML.
Diffstat (limited to 'src/lib/subtitle_content.h')
| -rw-r--r-- | src/lib/subtitle_content.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/subtitle_content.h b/src/lib/subtitle_content.h index 09cc92709..db2286339 100644 --- a/src/lib/subtitle_content.h +++ b/src/lib/subtitle_content.h @@ -47,7 +47,6 @@ class SubtitleContent : public ContentPart { public: SubtitleContent (Content* parent, boost::shared_ptr<const Film>); - SubtitleContent (Content* parent, boost::shared_ptr<const Film>, cxml::ConstNodePtr, int version); SubtitleContent (Content* parent, boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >); void as_xml (xmlpp::Node *) const; @@ -129,12 +128,16 @@ public: return _outline_colour; } + static boost::shared_ptr<SubtitleContent> from_xml (Content* parent, boost::shared_ptr<const Film>, cxml::ConstNodePtr, int version); + protected: /** subtitle language (e.g. "German") or empty if it is not known */ std::string _language; private: friend struct ffmpeg_pts_offset_test; + + SubtitleContent (Content* parent, boost::shared_ptr<const Film>, cxml::ConstNodePtr, int version); void font_changed (); void connect_to_fonts (); |
