X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwriter.cc;h=f14ef49ef320b8a7ca9cfd57cd0211d9ae526e5f;hb=7ec6c86c913fba820870565ee757fdf43ae47433;hp=bc299414bb8e72975e8399ee0ebc166041ed986a;hpb=8963f0007af1a312017b9627c18b82ec2a577591;p=dcpomatic.git

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index bc299414b..f14ef49ef 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -54,13 +54,9 @@
 
 using std::cout;
 using std::dynamic_pointer_cast;
-using std::list;
-using std::make_pair;
 using std::make_shared;
-using std::map;
 using std::max;
 using std::min;
-using std::pair;
 using std::shared_ptr;
 using std::string;
 using std::vector;
@@ -624,12 +620,18 @@ Writer::finish (boost::filesystem::path output_dcp)
 		issuer = String::compose("DCP-o-matic %1 %2", dcpomatic_version, dcpomatic_git_commit);
 	}
 
+	cpl->set_creator (creator);
+	cpl->set_issuer (issuer);
+
 	cpl->set_ratings (film()->ratings());
 
 	vector<dcp::ContentVersion> cv;
 	for (auto i: film()->content_versions()) {
 		cv.push_back (dcp::ContentVersion(i));
 	}
+	if (cv.empty()) {
+		cv = { dcp::ContentVersion("1") };
+	}
 	cpl->set_content_versions (cv);
 
 	cpl->set_full_content_title_text (film()->name());
@@ -651,6 +653,9 @@ Writer::finish (boost::filesystem::path output_dcp)
 	if (film()->luminance()) {
 		cpl->set_luminance (*film()->luminance());
 	}
+	if (film()->sign_language_video_language()) {
+		cpl->set_sign_language_video_language (*film()->sign_language_video_language());
+	}
 
 	auto ac = film()->mapped_audio_channels();
 	dcp::MCASoundField field = (
@@ -718,9 +723,9 @@ Writer::write_cover_sheet (boost::filesystem::path output_dcp)
 	boost::algorithm::replace_all (text, "$TYPE", film()->dcp_content_type()->pretty_name());
 	boost::algorithm::replace_all (text, "$CONTAINER", film()->container()->container_nickname());
 
-	auto audio_languages = film()->audio_languages();
-	if (!audio_languages.empty()) {
-		boost::algorithm::replace_all (text, "$AUDIO_LANGUAGE", audio_languages.front().description());
+	auto audio_language = film()->audio_language();
+	if (audio_language) {
+		boost::algorithm::replace_all (text, "$AUDIO_LANGUAGE", audio_language->description());
 	} else {
 		boost::algorithm::replace_all (text, "$AUDIO_LANGUAGE", _("None"));
 	}