std::shared_ptr

[dcpomatic.git] / src / lib / dcp_encoder.cc

diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc
index 345e5511c41bc6ec73ec0b484c941596525c3bb4..dfd8ed8d741bda0e75e75f777bf2002628c66ad0 100644 (file)
--- 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.
 
@@ -46,9 +46,10 @@
 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;
@@ -103,13 +104,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);
                }
@@ -125,7 +126,7 @@ DCPEncoder::go ()
 
        _finishing = true;
        _j2k_encoder->end ();
-       _writer->finish ();
+       _writer->finish (_film->dir(_film->dcp_name()));
 }
 
 void