summaryrefslogtreecommitdiff
path: root/src/lib/subtitle_content.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/subtitle_content.h')
-rw-r--r--src/lib/subtitle_content.h5
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 ();