Cleanup: handle Filter objects by value rather than by reference.

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

diff --git a/src/lib/text_content.h b/src/lib/text_content.h
index 7ddb20b080dabc63e503393c195c247cf9396830..4d4bdc507e478043ca2111c2fa0507d812aaec8d 100644 (file)
--- a/src/lib/text_content.h
+++ b/src/lib/text_content.h
@@ -199,13 +199,14 @@ public:
                return _language_is_additional;
        }
 
-       static std::list<std::shared_ptr<TextContent>> from_xml (Content* parent, cxml::ConstNodePtr, int version, std::list<std::string>& notes);
+       static std::vector<std::shared_ptr<TextContent>> from_xml(Content* parent, cxml::ConstNodePtr, int version, std::list<std::string>& notes);
 
 private:
        friend struct ffmpeg_pts_offset_test;
 
        void font_changed ();
        void connect_to_fonts ();
+       std::shared_ptr<dcpomatic::Font> get_font_unlocked(std::string id) const;
 
        std::list<boost::signals2::connection> _font_connections;