X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubtitle_encoder.cc;h=8b1d9a15ba7b5f9ca1d1d60d5da531f1f5580c8d;hb=0232d80a625b2ffae687e6473ab3fc2603cf87ea;hp=66957270fe91d0d6d2cbef7e11dd4223842931b8;hpb=c27d14badb229c24533db65dbaee1939dce89455;p=dcpomatic.git

diff --git a/src/lib/subtitle_encoder.cc b/src/lib/subtitle_encoder.cc
index 66957270f..8b1d9a15b 100644
--- a/src/lib/subtitle_encoder.cc
+++ b/src/lib/subtitle_encoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2019-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2019-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,11 +18,13 @@
 
 */
 
-#include "font_data.h"
-#include "subtitle_encoder.h"
-#include "player.h"
+
 #include "compose.hpp"
+#include "film.h"
 #include "job.h"
+#include "player.h"
+#include "subtitle_encoder.h"
+#include <dcp/filesystem.h>
 #include <dcp/interop_subtitle_asset.h>
 #include <dcp/raw_convert.h>
 #include <dcp/smpte_subtitle_asset.h>
@@ -31,6 +33,7 @@
 
 #include "i18n.h"
 
+
 using std::make_pair;
 using std::make_shared;
 using std::pair;
@@ -43,6 +46,7 @@ using namespace boost::placeholders;
 #endif
 using dcp::raw_convert;
 
+
 /** @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).
@@ -54,10 +58,10 @@ SubtitleEncoder::SubtitleEncoder (shared_ptr<const Film> film, shared_ptr<Job> j
 	, _reel_index (0)
 	, _length (film->length())
 {
-	_player->set_play_referenced ();
-	_player->set_ignore_video ();
-	_player->set_ignore_audio ();
-	_player->Text.connect (boost::bind(&SubtitleEncoder::text, this, _1, _2, _3, _4));
+	_player.set_play_referenced();
+	_player.set_ignore_video();
+	_player.set_ignore_audio();
+	_player.Text.connect(boost::bind(&SubtitleEncoder::text, this, _1, _2, _3, _4));
 
 	string const extension = film->interop() ? ".xml" : ".mxf";
 
@@ -65,7 +69,7 @@ SubtitleEncoder::SubtitleEncoder (shared_ptr<const Film> film, shared_ptr<Job> j
 	for (int i = 0; i < files; ++i) {
 
 		boost::filesystem::path filename = output;
-		if (boost::filesystem::is_directory(filename)) {
+		if (dcp::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.
@@ -75,7 +79,7 @@ SubtitleEncoder::SubtitleEncoder (shared_ptr<const Film> film, shared_ptr<Job> j
 			}
 		}
 
-		_assets.push_back (make_pair(shared_ptr<dcp::SubtitleAsset>(), boost::filesystem::change_extension(filename, extension)));
+		_assets.push_back(make_pair(shared_ptr<dcp::SubtitleAsset>(), dcp::filesystem::change_extension(filename, extension)));
 	}
 
 	for (auto i: film->reels()) {
@@ -85,6 +89,7 @@ SubtitleEncoder::SubtitleEncoder (shared_ptr<const Film> film, shared_ptr<Job> j
 	_default_font = dcp::ArrayData (default_font_file());
 }
 
+
 void
 SubtitleEncoder::go ()
 {
@@ -96,36 +101,37 @@ SubtitleEncoder::go ()
 
 	_reel_index = 0;
 
-	while (!_player->pass()) {}
+	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) {
+	for (auto& i: _assets) {
+		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());
+				auto s = make_shared<dcp::InteropSubtitleAsset>();
 				s->set_movie_title (_film->name());
 				s->set_reel_number (raw_convert<string>(reel + 1));
-				i->first = s;
+				i.first = s;
 			} else {
-				shared_ptr<dcp::SMPTESubtitleAsset> s (new dcp::SMPTESubtitleAsset());
+				auto s = make_shared<dcp::SMPTESubtitleAsset>();
 				s->set_content_title_text (_film->name());
 				s->set_reel_number (reel + 1);
-				i->first = s;
+				i.first = s;
 			}
 		}
 
 		if (!_film->interop() || _include_font) {
-			for (auto j: _player->get_subtitle_fonts()) {
-				i->first->add_font (j.id, _default_font);
+			for (auto j: _player.get_subtitle_fonts()) {
+				i.first->add_font(j->id(), j->data().get_value_or(_default_font));
 			}
 		}
 
-		i->first->write (i->second);
+		i.first->write (i.second);
 		++reel;
 	}
 }
 
+
 void
 SubtitleEncoder::text (PlayerText subs, TextType type, optional<DCPTextTrack> track, dcpomatic::DCPTimePeriod period)
 {
@@ -170,7 +176,7 @@ SubtitleEncoder::text (PlayerText subs, TextType type, optional<DCPTextTrack> tr
 		if (_film->interop() && !_include_font) {
 			i.unset_font ();
 		}
-		_assets[_reel_index].first->add (shared_ptr<dcp::Subtitle>(new dcp::SubtitleString(i)));
+		_assets[_reel_index].first->add (make_shared<dcp::SubtitleString>(i));
 	}
 
 	if (_split_reels && (_reel_index < int(_reels.size()) - 1) && period.from > _reels[_reel_index].from) {
@@ -179,12 +185,13 @@ SubtitleEncoder::text (PlayerText subs, TextType type, optional<DCPTextTrack> tr
 
 	_last = period.from;
 
-	shared_ptr<Job> job = _job.lock ();
+	auto job = _job.lock ();
 	if (job) {
 		job->set_progress (float(period.from.get()) / _length.get());
 	}
 }
 
+
 Frame
 SubtitleEncoder::frames_done () const
 {