X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Factive_text.h;h=f5211ae7f0cc68983c541b6ba0206dc6d41e178a;hb=8336cba4e6a8c594680696d2337ddc800d84c267;hp=90b6b533bfe761d6bc205d6bfc93effe202ee259;hpb=c4403784febdbdd42e9c32e67fadb147f11fe566;p=dcpomatic.git 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 get_burnt (dcpomatic::DCPTimePeriod period, bool always_burn_captions) const; void clear_before (dcpomatic::DCPTime time); void clear (); - void add_from (boost::weak_ptr content, PlayerText ps, dcpomatic::DCPTime from); - std::pair add_to (boost::weak_ptr content, dcpomatic::DCPTime to); - bool have (boost::weak_ptr content) const; + void add_from (std::weak_ptr content, PlayerText ps, dcpomatic::DCPTime from); + std::pair add_to (std::weak_ptr content, dcpomatic::DCPTime to); + bool have (std::weak_ptr content) const; private: class Period @@ -60,7 +60,7 @@ private: boost::optional to; }; - typedef std::map, std::list > Map; + typedef std::map, std::list, std::owner_less>> Map; mutable boost::mutex _mutex; Map _data;