X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fwriter.cc;h=3fc01571e559756fc9506bc818a4e07a1e09d258;hb=bd83f1b0e1d8e7aae0af51376dbbb88d5e3f69d0;hp=45a74624f7da19564766b26ef2eba18da8f59b84;hpb=196de029044f4dbac5f74f68e08a89f778c3a236;p=dcpomatic.git

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 45a74624f..3fc01571e 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -35,6 +35,7 @@
 #include "font.h"
 #include "util.h"
 #include "reel_writer.h"
+#include "text_content.h"
 #include <dcp/cpl.h>
 #include <dcp/locale_convert.h>
 #include <boost/foreach.hpp>
@@ -62,6 +63,7 @@ using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
 using dcp::Data;
+using namespace dcpomatic;
 
 Writer::Writer (shared_ptr<const Film> film, weak_ptr<Job> j)
 	: _film (film)
@@ -557,6 +559,7 @@ Writer::finish ()
 	meta.set_issue_date_now ();
 
 	cpl->set_metadata (meta);
+	cpl->set_ratings (vector_to_list(_film->ratings()));
 
 	shared_ptr<const dcp::CertificateChain> signer;
 	if (_film->is_signed ()) {
@@ -591,7 +594,16 @@ Writer::write_cover_sheet ()
 	boost::algorithm::replace_all (text, "$TYPE", _film->dcp_content_type()->pretty_name());
 	boost::algorithm::replace_all (text, "$CONTAINER", _film->container()->container_nickname());
 	boost::algorithm::replace_all (text, "$AUDIO_LANGUAGE", _film->isdcf_metadata().audio_language);
-	boost::algorithm::replace_all (text, "$SUBTITLE_LANGUAGE", _film->isdcf_metadata().subtitle_language);
+
+	optional<string> subtitle_language;
+	BOOST_FOREACH (shared_ptr<Content> i, _film->content()) {
+		BOOST_FOREACH (shared_ptr<TextContent> j, i->text) {
+			if (j->type() == TEXT_OPEN_SUBTITLE && j->use()) {
+				subtitle_language = j->language ();
+			}
+		}
+	}
+	boost::algorithm::replace_all (text, "$SUBTITLE_LANGUAGE", subtitle_language.get_value_or("None"));
 
 	boost::uintmax_t size = 0;
 	for (