Write annotation text and language to CCAP nodes correctly.

3 files changed, 28 insertions, 7 deletions

diff --git a/cscript b/cscript
index 3b73c6210..47efefdba 100644
--- a/cscript
+++ b/cscript
@@ -328,8 +328,8 @@ def dependencies(target):
     else:
         deps = [('ffmpeg-cdist', '27f25fb', ffmpeg_options)]
 
-    deps.append(('libdcp', '90aa785'))
-    deps.append(('libsub', 'd24512e'))
+    deps.append(('libdcp', 'f2f2a2a'))
+    deps.append(('libsub', 'c2d6d92'))
     deps.append(('rtaudio-cdist', '739969e'))
 
     return deps
diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index 7b0233d21..9a600a739 100644
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -335,7 +335,7 @@ ReelWriter::finish ()
 }
 
 template <class T>
-void
+shared_ptr<T>
 maybe_add_text (
 	shared_ptr<dcp::SubtitleAsset> asset,
 	int64_t picture_duration,
@@ -419,6 +419,8 @@ maybe_add_text (
 		}
 		reel->add (reel_asset);
 	}
+
+	return reel_asset;
 }
 
 shared_ptr<dcp::Reel>
@@ -507,9 +509,13 @@ ReelWriter::create_reel (list<ReferencedReelAsset> const & refs, list<shared_ptr
 	}
 	reel->add (reel_sound_asset);
 
-	maybe_add_text<dcp::ReelSubtitleAsset> (_subtitle_asset,  reel_picture_asset->duration(), reel, refs, fonts, _film, _period);
+	maybe_add_text<dcp::ReelSubtitleAsset> (_subtitle_asset, reel_picture_asset->duration(), reel, refs, fonts, _film, _period);
 	for (map<DCPTextTrack, shared_ptr<dcp::SubtitleAsset> >::const_iterator i = _closed_caption_assets.begin(); i != _closed_caption_assets.end(); ++i) {
-		maybe_add_text<dcp::ReelClosedCaptionAsset> (i->second, reel_picture_asset->duration(), reel, refs, fonts, _film, _period);
+		shared_ptr<dcp::ReelClosedCaptionAsset> a = maybe_add_text<dcp::ReelClosedCaptionAsset> (
+			i->second, reel_picture_asset->duration(), reel, refs, fonts, _film, _period
+			);
+		a->set_annotation_text (i->first.name);
+		a->set_language (i->first.language);
 	}
 
 	return reel;
diff --git a/test/closed_caption_test.cc b/test/closed_caption_test.cc
index 35abf1b02..0409d5849 100644
--- a/test/closed_caption_test.cc
+++ b/test/closed_caption_test.cc
@@ -25,8 +25,10 @@
 #include <dcp/dcp.h>
 #include <dcp/cpl.h>
 #include <dcp/reel.h>
+#include <dcp/reel_closed_caption_asset.h>
 #include <boost/test/unit_test.hpp>
 
+using std::list;
 using boost::shared_ptr;
 
 /** Basic test that Interop closed captions are written */
@@ -81,6 +83,19 @@ BOOST_AUTO_TEST_CASE (closed_caption_test2)
 
 	BOOST_REQUIRE_EQUAL (check.cpls().size(), 1);
 	BOOST_REQUIRE_EQUAL (check.cpls().front()->reels().size(), 1);
-	std::cout << !check.cpls().front()->reels().front()->closed_captions().size() << "\n";
-	BOOST_REQUIRE_EQUAL (!check.cpls().front()->reels().front()->closed_captions().size(), 3);
+	list<shared_ptr<dcp::ReelClosedCaptionAsset> > ccaps = check.cpls().front()->reels().front()->closed_captions();
+	BOOST_REQUIRE_EQUAL (ccaps.size(), 3);
+
+	list<shared_ptr<dcp::ReelClosedCaptionAsset> >::const_iterator i = ccaps.begin ();
+	BOOST_CHECK_EQUAL ((*i)->annotation_text(), "First track");
+	BOOST_REQUIRE (static_cast<bool>((*i)->language()));
+	BOOST_CHECK_EQUAL ((*i)->language().get(), "French");
+	++i;
+	BOOST_CHECK_EQUAL ((*i)->annotation_text(), "Second track");
+	BOOST_REQUIRE (static_cast<bool>((*i)->language()));
+	BOOST_CHECK_EQUAL ((*i)->language().get(), "German");
+	++i;
+	BOOST_CHECK_EQUAL ((*i)->annotation_text(), "Third track");
+	BOOST_REQUIRE (static_cast<bool>((*i)->language()));
+	BOOST_CHECK_EQUAL ((*i)->language().get(), "Italian");
 }