Remove FFmpeg::_packet.

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

diff --git a/src/lib/text_content.h b/src/lib/text_content.h
index 1c7eef19a031ff05b0e07d74bd9a8e656dd7af1c..e566d05524721fc952f4cbaeb4fd4806d8c4df95 100644 (file)
--- a/src/lib/text_content.h
+++ b/src/lib/text_content.h
@@ -62,13 +62,14 @@ class TextContent : public ContentPart
 {
 public:
        TextContent (Content* parent, TextType type, TextType original_type);
-       TextContent (Content* parent, std::vector<boost::shared_ptr<Content> >);
+       TextContent (Content* parent, std::vector<std::shared_ptr<Content> >);
+       TextContent (Content* parent, cxml::ConstNodePtr, int version);
 
        void as_xml (xmlpp::Node *) const;
        std::string identifier () const;
-       void take_settings_from (boost::shared_ptr<const TextContent> c);
+       void take_settings_from (std::shared_ptr<const TextContent> c);
 
-       void add_font (boost::shared_ptr<dcpomatic::Font> font);
+       void add_font (std::shared_ptr<dcpomatic::Font> font);
 
        void set_use (bool);
        void set_burn (bool);
@@ -122,7 +123,7 @@ public:
                return _y_scale;
        }
 
-       std::list<boost::shared_ptr<dcpomatic::Font> > fonts () const {
+       std::list<std::shared_ptr<dcpomatic::Font> > fonts () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _fonts;
        }
@@ -177,12 +178,11 @@ public:
                return _dcp_track;
        }
 
-       static std::list<boost::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);
 
 private:
        friend struct ffmpeg_pts_offset_test;
 
-       TextContent (Content* parent, cxml::ConstNodePtr, int version);
        void font_changed ();
        void connect_to_fonts ();
 
@@ -202,7 +202,7 @@ private:
        double _x_scale;
        /** y scale factor to apply to subtitles */
        double _y_scale;
-       std::list<boost::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;