X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fsubtitle_encoder.cc;h=19241bd6ed994d0c39581394b68ce65b2f304ae4;hp=43c68bc2218e6e34b642aabff6d87543a78c6ae4;hb=a0873f70fbc95cc45106c61e9b3c5dfda3b946f9;hpb=2cdf3d9f461b12d0925cc54368105bbd177bbbb3

diff --git a/src/lib/subtitle_encoder.cc b/src/lib/subtitle_encoder.cc
index 43c68bc22..19241bd6e 100644
--- a/src/lib/subtitle_encoder.cc
+++ b/src/lib/subtitle_encoder.cc
@@ -18,6 +18,7 @@
 
 */
 
+#include "font.h"
 #include "subtitle_encoder.h"
 #include "player.h"
 #include "compose.hpp"
@@ -39,9 +40,14 @@ using boost::shared_ptr;
 using boost::optional;
 using dcp::raw_convert;
 
-SubtitleEncoder::SubtitleEncoder (shared_ptr<const Film> film, shared_ptr<Job> job, boost::filesystem::path output, bool split_reels)
+/** @param output Directory, if there will be multiple output files, or a filename.
+ *  @param initial_name Hint that may be used to create filenames, if @ref output is a directory.
+ *  @param include_font true to refer to and export any font file (for Interop; ignored for SMPTE).
+ */
+SubtitleEncoder::SubtitleEncoder (shared_ptr<const Film> film, shared_ptr<Job> job, boost::filesystem::path output, string initial_name, bool split_reels, bool include_font)
 	: Encoder (film, job)
 	, _split_reels (split_reels)
+	, _include_font (include_font)
 	, _reel_index (0)
 	, _length (film->length())
 {
@@ -50,20 +56,23 @@ SubtitleEncoder::SubtitleEncoder (shared_ptr<const Film> film, shared_ptr<Job> j
 	_player->set_ignore_audio ();
 	_player->Text.connect (boost::bind(&SubtitleEncoder::text, this, _1, _2, _3, _4));
 
+	string const extension = film->interop() ? ".xml" : ".mxf";
+
 	int const files = split_reels ? film->reels().size() : 1;
 	for (int i = 0; i < files; ++i) {
 
 		boost::filesystem::path filename = output;
-		string extension = boost::filesystem::extension (filename);
-		filename = boost::filesystem::change_extension (filename, "");
-
-		if (files > 1) {
-			/// TRANSLATORS: _reel%1 here is to be added to an export filename to indicate
-			/// which reel it is.  Preserve the %1; it will be replaced with the reel number.
-			filename = filename.string() + String::compose(_("_reel%1"), i + 1);
+		if (boost::filesystem::is_directory(filename)) {
+			if (files > 1) {
+				/// TRANSLATORS: _reel%1 here is to be added to an export filename to indicate
+				/// which reel it is.  Preserve the %1; it will be replaced with the reel number.
+				filename /= String::compose("%1_reel%2", initial_name, i + 1);
+			} else {
+				filename /= initial_name;
+			}
 		}
 
-		_assets.push_back (make_pair(shared_ptr<dcp::SubtitleAsset>(), filename));
+		_assets.push_back (make_pair(shared_ptr<dcp::SubtitleAsset>(), boost::filesystem::change_extension(filename, extension)));
 	}
 
 	BOOST_FOREACH (dcpomatic::DCPTimePeriod i, film->reels()) {
@@ -84,10 +93,31 @@ SubtitleEncoder::go ()
 
 	while (!_player->pass()) {}
 
+	int reel = 0;
 	for (vector<pair<shared_ptr<dcp::SubtitleAsset>, boost::filesystem::path> >::iterator i = _assets.begin(); i != _assets.end(); ++i) {
-		if (i->first) {
-			i->first->write (i->second);
+		if (!i->first) {
+			/* No subtitles arrived for this asset; make an empty one so we write something to the output */
+			if (_film->interop()) {
+				shared_ptr<dcp::InteropSubtitleAsset> s (new dcp::InteropSubtitleAsset());
+				s->set_movie_title (_film->name());
+				s->set_reel_number (raw_convert<string>(reel + 1));
+				i->first = s;
+			} else {
+				shared_ptr<dcp::SMPTESubtitleAsset> s (new dcp::SMPTESubtitleAsset());
+				s->set_content_title_text (_film->name());
+				s->set_reel_number (reel + 1);
+				i->first = s;
+			}
 		}
+
+		if (!_film->interop() || _include_font) {
+			BOOST_FOREACH (shared_ptr<dcpomatic::Font> j, _player->get_subtitle_fonts()) {
+				i->first->add_font (j->id(), default_font_file());
+			}
+		}
+
+		i->first->write (i->second);
+		++reel;
 	}
 }
 
@@ -130,6 +160,9 @@ SubtitleEncoder::text (PlayerText subs, TextType type, optional<DCPTextTrack> tr
 		/* XXX: couldn't / shouldn't we use period here rather than getting time from the subtitle? */
 		i.set_in  (i.in());
 		i.set_out (i.out());
+		if (_film->interop() && !_include_font) {
+			i.unset_font ();
+		}
 		_assets[_reel_index].first->add (shared_ptr<dcp::Subtitle>(new dcp::SubtitleString(i)));
 	}