summaryrefslogtreecommitdiff
path: root/src/lib/active_text.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/active_text.h
parent0d35820cf50d2789752b8776683b26d04642518d (diff)
std::shared_ptr
Diffstat (limited to 'src/lib/active_text.h')
-rw-r--r--src/lib/active_text.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/active_text.h b/src/lib/active_text.h
index 90b6b533b..f5211ae7f 100644
--- a/src/lib/active_text.h
+++ b/src/lib/active_text.h
@@ -40,9 +40,9 @@ public:
std::list<PlayerText> get_burnt (dcpomatic::DCPTimePeriod period, bool always_burn_captions) const;
void clear_before (dcpomatic::DCPTime time);
void clear ();
- void add_from (boost::weak_ptr<const TextContent> content, PlayerText ps, dcpomatic::DCPTime from);
- std::pair<PlayerText, dcpomatic::DCPTime> add_to (boost::weak_ptr<const TextContent> content, dcpomatic::DCPTime to);
- bool have (boost::weak_ptr<const TextContent> content) const;
+ void add_from (std::weak_ptr<const TextContent> content, PlayerText ps, dcpomatic::DCPTime from);
+ std::pair<PlayerText, dcpomatic::DCPTime> add_to (std::weak_ptr<const TextContent> content, dcpomatic::DCPTime to);
+ bool have (std::weak_ptr<const TextContent> content) const;
private:
class Period
@@ -60,7 +60,7 @@ private:
boost::optional<dcpomatic::DCPTime> to;
};
- typedef std::map<boost::weak_ptr<const TextContent>, std::list<Period> > Map;
+ typedef std::map<std::weak_ptr<const TextContent>, std::list<Period>, std::owner_less<std::weak_ptr<const TextContent>>> Map;
mutable boost::mutex _mutex;
Map _data;