std::shared_ptr

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

diff --git a/src/lib/active_text.h b/src/lib/active_text.h
index 90b6b533bfe761d6bc205d6bfc93effe202ee259..f5211ae7f0cc68983c541b6ba0206dc6d41e178a 100644 (file)
--- 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;