C++11 and whitespace cleanups.

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

diff --git a/src/lib/active_text.h b/src/lib/active_text.h
index 09ef1cdaf80460df48a1280a7d7eb3ad4467c22d..d5ce4cb0759895d2b235a9e205c9a8a264e14767 100644 (file)
--- a/src/lib/active_text.h
+++ b/src/lib/active_text.h
@@ -18,30 +18,39 @@
 
 */
 
-/** @file  src/lib/active_text.h
+
+/** @file  src/lib/active_captions.h
  *  @brief ActiveText class.
  */
 
+
 #include "dcpomatic_time.h"
 #include "player_text.h"
-#include <boost/noncopyable.hpp>
+#include <boost/thread/mutex.hpp>
 #include <list>
 #include <map>
 
-class Piece;
+
+class TextContent;
+
 
 /** @class ActiveText
  *  @brief A class to maintain information on active subtitles for Player.
  */
-class ActiveText : public boost::noncopyable
+class ActiveText
 {
 public:
-       std::list<PlayerText> get_burnt (DCPTimePeriod period, bool always_burn_subtitles) const;
-       void clear_before (DCPTime time);
+       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<Piece> piece, PlayerText ps, DCPTime from);
-       std::pair<PlayerText, DCPTime> add_to (boost::weak_ptr<Piece> piece, DCPTime to);
-       bool have (boost::weak_ptr<Piece> piece) 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
@@ -49,17 +58,18 @@ private:
        public:
                Period () {}
 
-               Period (PlayerText s, DCPTime f)
+               Period (PlayerText s, dcpomatic::DCPTime f)
                        : subs (s)
                        , from (f)
                {}
 
                PlayerText subs;
-               DCPTime from;
-               boost::optional<DCPTime> to;
+               dcpomatic::DCPTime from;
+               boost::optional<dcpomatic::DCPTime> to;
        };
 
-       typedef std::map<boost::weak_ptr<Piece>, 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;
 };