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, 24 insertions, 19 deletions

diff --git a/src/lib/player.cc b/src/lib/player.cc
index dfd309774..4635233ff 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -676,29 +676,34 @@ Player::pass ()
 	return done;
 }
 
+list<PlayerCaption>
+Player::closed_captions_for_frame (DCPTime time) const
+{
+	return _active_captions[CAPTION_CLOSED].get (
+		DCPTimePeriod(time, time + DCPTime::from_frames(1, _film->video_frame_rate()))
+		);
+}
+
+/** @return Open captions for the frame at the given time, converted to images */
 optional<PositionImage>
-Player::captions_for_frame (DCPTime time) const
+Player::open_captions_for_frame (DCPTime time) const
 {
 	list<PositionImage> captions;
-
 	int const vfr = _film->video_frame_rate();
 
-	for (int i = 0; i < CAPTION_COUNT; ++i) {
-		bool const always = i == CAPTION_OPEN && _always_burn_open_captions;
-		BOOST_FOREACH (
-			PlayerCaption j,
-			_active_captions[i].get_burnt(DCPTimePeriod(time, time + DCPTime::from_frames(1, vfr)), always)
-			) {
-
-			/* Image subtitles */
-			list<PositionImage> c = transform_bitmap_captions (j.image);
-			copy (c.begin(), c.end(), back_inserter (captions));
-
-			/* Text subtitles (rendered to an image) */
-			if (!j.text.empty ()) {
-				list<PositionImage> s = render_text (j.text, j.fonts, _video_container_size, time, vfr);
-				copy (s.begin(), s.end(), back_inserter (captions));
-			}
+	BOOST_FOREACH (
+		PlayerCaption j,
+		_active_captions[CAPTION_OPEN].get_burnt(DCPTimePeriod(time, time + DCPTime::from_frames(1, vfr)), _always_burn_open_captions)
+		) {
+
+		/* Image subtitles */
+		list<PositionImage> c = transform_bitmap_captions (j.image);
+		copy (c.begin(), c.end(), back_inserter (captions));
+
+		/* Text subtitles (rendered to an image) */
+		if (!j.text.empty ()) {
+			list<PositionImage> s = render_text (j.text, j.fonts, _video_container_size, time, vfr);
+			copy (s.begin(), s.end(), back_inserter (captions));
 		}
 	}
 
@@ -1047,7 +1052,7 @@ Player::do_emit_video (shared_ptr<PlayerVideo> pv, DCPTime time)
 		}
 	}
 
-	optional<PositionImage> captions = captions_for_frame (time);
+	optional<PositionImage> captions = open_captions_for_frame (time);
 	if (captions) {
 		pv->set_caption (captions.get ());
 	}