X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_encoder.cc;h=0478fcf809ac94e367667204d72b440ac53ca3d4;hb=a5d004b0773f633401528392fc28e66d70e13ac8;hp=438a73fd64d4b95ea93facb66091a2f7d0b84d30;hpb=ca981c8cfa23111e92be329f1c2dfbe3a07b4247;p=dcpomatic.git

diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc
index 438a73fd6..0478fcf80 100644
--- a/src/lib/dcp_encoder.cc
+++ b/src/lib/dcp_encoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -38,7 +38,6 @@
 #include "text_content.h"
 #include "player_video.h"
 #include <boost/signals2.hpp>
-#include <boost/foreach.hpp>
 #include <iostream>
 
 #include "i18n.h"
@@ -46,10 +45,14 @@
 using std::string;
 using std::cout;
 using std::list;
-using boost::shared_ptr;
-using boost::weak_ptr;
-using boost::dynamic_pointer_cast;
+using std::vector;
+using std::shared_ptr;
+using std::weak_ptr;
+using std::dynamic_pointer_cast;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using namespace dcpomatic;
 
 /** Construct a DCP encoder.
@@ -66,8 +69,8 @@ DCPEncoder::DCPEncoder (shared_ptr<const Film> film, weak_ptr<Job> job)
 	_player_text_connection = _player->Text.connect (bind (&DCPEncoder::text, this, _1, _2, _3, _4));
 	_player_atmos_connection = _player->Atmos.connect (bind (&DCPEncoder::atmos, this, _1, _2, _3));
 
-	BOOST_FOREACH (shared_ptr<const Content> c, film->content ()) {
-		BOOST_FOREACH (shared_ptr<TextContent> i, c->text) {
+	for (auto c: film->content ()) {
+		for (auto i: c->text) {
 			if (i->use() && !i->burn()) {
 				_non_burnt_subtitles = true;
 			}
@@ -100,13 +103,13 @@ DCPEncoder::go ()
 	}
 
 	if (_non_burnt_subtitles) {
-		list<shared_ptr<Font> > fonts = _player->get_subtitle_fonts ();
+		vector<FontData> fonts = _player->get_subtitle_fonts ();
 
 		if (fonts.size() > 1 && _film->interop()) {
 			/* Interop will ignore second and subsequent <LoadFont>s so don't even
 			   write them as they upset some validators.
 			*/
-			shared_ptr<Font> first = fonts.front ();
+			FontData first = fonts.front ();
 			fonts.clear ();
 			fonts.push_back (first);
 		}
@@ -116,13 +119,13 @@ DCPEncoder::go ()
 
 	while (!_player->pass ()) {}
 
-	BOOST_FOREACH (ReferencedReelAsset i, _player->get_reel_assets ()) {
+	for (auto i: _player->get_reel_assets()) {
 		_writer->write (i);
 	}
 
 	_finishing = true;
 	_j2k_encoder->end ();
-	_writer->finish ();
+	_writer->finish (_film->dir(_film->dcp_name()));
 }
 
 void