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, 1 deletions

diff --git a/src/lib/player.h b/src/lib/player.h
index d54d927cd..8b85a011f 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -86,6 +86,8 @@ public:
 
 	DCPTime content_time_to_dcp (boost::shared_ptr<Content> content, ContentTime t);
 
+	std::list<PlayerCaption> closed_captions_for_frame (DCPTime time) const;
+
 	/** Emitted when something has changed such that if we went back and emitted
 	 *  the last frame again it would look different.  This is not emitted after
 	 *  a seek.
@@ -134,7 +136,7 @@ private:
 	std::pair<boost::shared_ptr<AudioBuffers>, DCPTime> discard_audio (
 		boost::shared_ptr<const AudioBuffers> audio, DCPTime time, DCPTime discard_to
 		) const;
-	boost::optional<PositionImage> captions_for_frame (DCPTime time) const;
+	boost::optional<PositionImage> open_captions_for_frame (DCPTime time) const;
 	void emit_video (boost::shared_ptr<PlayerVideo> pv, DCPTime time);
 	void do_emit_video (boost::shared_ptr<PlayerVideo> pv, DCPTime time);
 	void emit_audio (boost::shared_ptr<AudioBuffers> data, DCPTime time);