summaryrefslogtreecommitdiff
path: root/src/lib/text_content.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-01-04 21:16:53 +0100
committerCarl Hetherington <cth@carlh.net>2021-01-07 22:48:29 +0100
commitdd9be86db6cde0afa5da0d1d1ac43b42e05dca26 (patch)
treee56a3f82fb9e1c8602f265bea0d0688d8a018644 /src/lib/text_content.h
parent0d35820cf50d2789752b8776683b26d04642518d (diff)
std::shared_ptr
Diffstat (limited to 'src/lib/text_content.h')
-rw-r--r--src/lib/text_content.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/text_content.h b/src/lib/text_content.h
index 1c7eef19a..21d09ad12 100644
--- a/src/lib/text_content.h
+++ b/src/lib/text_content.h
@@ -62,13 +62,13 @@ 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> >);
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 +122,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,7 +177,7 @@ 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;
@@ -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;