More c++ tidying.

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

diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc
index 438a73fd64d4b95ea93facb66091a2f7d0b84d30..4b4785cc6e362021cab8c4ba6c8cada370810c23 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.
 
@@ -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,15 @@
 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 std::make_shared;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using namespace dcpomatic;
 
 /** Construct a DCP encoder.
@@ -66,8 +70,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;
                        }
@@ -87,26 +91,26 @@ DCPEncoder::~DCPEncoder ()
 void
 DCPEncoder::go ()
 {
-       _writer.reset (new Writer (_film, _job));
+       _writer = make_shared<Writer>(_film, _job);
        _writer->start ();
 
-       _j2k_encoder.reset (new J2KEncoder (_film, _writer));
+       _j2k_encoder = make_shared<J2KEncoder>(_film, _writer);
        _j2k_encoder->begin ();
 
        {
-               shared_ptr<Job> job = _job.lock ();
+               auto job = _job.lock ();
                DCPOMATIC_ASSERT (job);
                job->sub (_("Encoding"));
        }
 
        if (_non_burnt_subtitles) {
-               list<shared_ptr<Font> > fonts = _player->get_subtitle_fonts ();
+               auto 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 ();
+                       auto first = fonts.front();
                        fonts.clear ();
                        fonts.push_back (first);
                }
@@ -116,13 +120,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
@@ -146,7 +150,7 @@ DCPEncoder::audio (shared_ptr<AudioBuffers> data, DCPTime time)
 {
        _writer->write (data, time);
 
-       shared_ptr<Job> job = _job.lock ();
+       auto job = _job.lock ();
        DCPOMATIC_ASSERT (job);
        job->set_progress (float(time.get()) / _film->length().get());
 }
@@ -171,7 +175,7 @@ optional<float>
 DCPEncoder::current_rate () const
 {
        if (!_j2k_encoder) {
-               return optional<float>();
+               return {};
        }
 
        return _j2k_encoder->current_encoding_rate ();