BOOST_FOREACH.

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

diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc
index 448fc2a5298e4e506f99c52cef110ec5bbaf21e5..0478fcf809ac94e367667204d72b440ac53ca3d4 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,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.
@@ -64,9 +67,10 @@ DCPEncoder::DCPEncoder (shared_ptr<const Film> film, weak_ptr<Job> job)
        _player_video_connection = _player->Video.connect (bind (&DCPEncoder::video, this, _1, _2));
        _player_audio_connection = _player->Audio.connect (bind (&DCPEncoder::audio, this, _1, _2));
        _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;
                        }
@@ -80,6 +84,7 @@ DCPEncoder::~DCPEncoder ()
        _player_video_connection.release ();
        _player_audio_connection.release ();
        _player_text_connection.release ();
+       _player_atmos_connection.release ();
 }
 
 void
@@ -98,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);
                }
@@ -114,21 +119,26 @@ 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
 DCPEncoder::video (shared_ptr<PlayerVideo> data, DCPTime time)
 {
-       if (!_film->three_d() && data->eyes() == EYES_LEFT) {
-               /* Use left-eye images for both eyes */
-               data->set_eyes (EYES_BOTH);
+       if (!_film->three_d()) {
+               if (data->eyes() == EYES_LEFT) {
+                       /* Use left-eye images for both eyes... */
+                       data->set_eyes (EYES_BOTH);
+               } else if (data->eyes() == EYES_RIGHT) {
+                       /* ...and discard the right */
+                       return;
+               }
        }
 
        _j2k_encoder->encode (data, time);
@@ -152,6 +162,14 @@ DCPEncoder::text (PlayerText data, TextType type, optional<DCPTextTrack> track,
        }
 }
 
+
+void
+DCPEncoder::atmos (shared_ptr<const dcp::AtmosFrame> data, DCPTime time, AtmosMetadata metadata)
+{
+       _writer->write (data, time, metadata);
+}
+
+
 optional<float>
 DCPEncoder::current_rate () const
 {