Get ccaps by asking the Player, rather than by listening to its emissions,

which is slightly cleaner and works when subtitles are emitted with an
unknown end time.  Also add CCAPs to the player.

1 files changed, 3 insertions, 0 deletions

diff --git a/src/lib/active_captions.h b/src/lib/active_captions.h
index 10b0b5da9..8e38564f5 100644
--- a/src/lib/active_captions.h
+++ b/src/lib/active_captions.h
@@ -36,6 +36,7 @@ class CaptionContent;
 class ActiveCaptions : public boost::noncopyable
 {
 public:
+	std::list<PlayerCaption> get (DCPTimePeriod period) const;
 	std::list<PlayerCaption> get_burnt (DCPTimePeriod period, bool always_burn_captions) const;
 	void clear_before (DCPTime time);
 	void clear ();
@@ -61,5 +62,7 @@ private:
 
 	typedef std::map<boost::weak_ptr<const CaptionContent>, std::list<Period> > Map;
 
+	void add (DCPTimePeriod period, std::list<PlayerCaption>& pc, std::list<Period> p) const;
+
 	Map _data;
 };