Rearrange subtitle font management.

[dcpomatic.git] / src / lib / text_content.h

diff --git a/src/lib/text_content.h b/src/lib/text_content.h
index 4c6918a4220d0d5cc39610f7d20a1e89245199cf..f46b6c6d0068733a1a17973fd6def36d5deab53f 100644 (file)
--- a/src/lib/text_content.h
+++ b/src/lib/text_content.h
@@ -69,14 +69,15 @@ class TextContent : public ContentPart
 {
 public:
        TextContent (Content* parent, TextType type, TextType original_type);
-       TextContent (Content* parent, std::vector<std::shared_ptr<Content> >);
-       TextContent (Content* parent, cxml::ConstNodePtr, int version);
+       TextContent (Content* parent, std::vector<std::shared_ptr<Content>>);
+       TextContent (Content* parent, cxml::ConstNodePtr, int version, std::list<std::string>& notes);
 
        void as_xml (xmlpp::Node *) const;
        std::string identifier () const;
        void take_settings_from (std::shared_ptr<const TextContent> c);
 
        void add_font (std::shared_ptr<dcpomatic::Font> font);
+       std::shared_ptr<dcpomatic::Font> get_font(std::string id) const;
 
        void set_use (bool);
        void set_burn (bool);
@@ -132,7 +133,7 @@ public:
                return _y_scale;
        }
 
-       std::list<std::shared_ptr<dcpomatic::Font> > fonts () const {
+       std::list<std::shared_ptr<dcpomatic::Font>> fonts () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _fonts;
        }
@@ -197,7 +198,7 @@ public:
                return _language_is_additional;
        }
 
-       static std::list<std::shared_ptr<TextContent>> from_xml (Content* parent, cxml::ConstNodePtr, int version);
+       static std::list<std::shared_ptr<TextContent>> from_xml (Content* parent, cxml::ConstNodePtr, int version, std::list<std::string>& notes);
 
 private:
        friend struct ffmpeg_pts_offset_test;
@@ -221,7 +222,7 @@ private:
        double _x_scale;
        /** y scale factor to apply to subtitles */
        double _y_scale;
-       std::list<std::shared_ptr<dcpomatic::Font> > _fonts;
+       std::list<std::shared_ptr<dcpomatic::Font>> _fonts;
        boost::optional<dcp::Colour> _colour;
        boost::optional<dcp::Effect> _effect;
        boost::optional<dcp::Colour> _effect_colour;