Updated es_ES translation from Manuel AC.

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

diff --git a/src/lib/active_text.h b/src/lib/active_text.h
index 90b6b533bfe761d6bc205d6bfc93effe202ee259..b54957b3ff270da744b6f6e29e4bb4a722f63277 100644 (file)
--- a/src/lib/active_text.h
+++ b/src/lib/active_text.h
@@ -24,7 +24,6 @@
 
 #include "dcpomatic_time.h"
 #include "player_text.h"
-#include <boost/noncopyable.hpp>
 #include <boost/thread/mutex.hpp>
 #include <list>
 #include <map>
@@ -34,15 +33,20 @@ class TextContent;
 /** @class ActiveText
  *  @brief A class to maintain information on active subtitles for Player.
  */
-class ActiveText : public boost::noncopyable
+class ActiveText
 {
 public:
+       ActiveText () {}
+
+       ActiveText (ActiveText const&) = delete;
+       ActiveText& operator= (ActiveText const&) = delete;
+
        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 +64,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;