BOOST_FOREACH.

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

diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc
index 8f9b3defc676af3f81494c2b7796649a1e53fe16..cc4f18bb6bb3d381ebf19309b77d58cd91349419 100644 (file)
--- a/src/lib/ffmpeg_encoder.cc
+++ b/src/lib/ffmpeg_encoder.cc
@@ -38,9 +38,9 @@ using std::cout;
 using std::pair;
 using std::list;
 using std::map;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::bind;
-using boost::weak_ptr;
+using std::weak_ptr;
 using boost::optional;
 using namespace dcpomatic;
 #if BOOST_VERSION >= 106100
@@ -57,10 +57,6 @@ FFmpegEncoder::FFmpegEncoder (
        bool split_reels,
        bool audio_stream_per_channel,
        int x264_crf
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       , optional<dcp::Key> key
-       , optional<string> id
-#endif
        )
        : Encoder (film, job)
        , _history (200)
@@ -110,7 +106,9 @@ FFmpegEncoder::FFmpegEncoder (
                }
        }
 
-       _butler.reset (new Butler(_player, map, _output_audio_channels, bind(&PlayerVideo::force, _1, FFmpegFileEncoder::pixel_format(format)), true, false));
+       _butler.reset (
+               new Butler(_film, _player, map, _output_audio_channels, bind(&PlayerVideo::force, _1, FFmpegFileEncoder::pixel_format(format)), VIDEO_RANGE_VIDEO, true, false)
+               );
 }
 
 
@@ -152,10 +150,6 @@ FFmpegEncoder::go ()
                                _film->three_d(),
                                filename,
                                extension
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-                               , key
-                               , id
-#endif
                                )
                        );
        }
@@ -218,7 +212,7 @@ FFmpegEncoder::go ()
        }
        delete[] interleaved;
 
-       BOOST_FOREACH (FileEncoderSet i, file_encoders) {
+       for (auto i: file_encoders) {
                i.flush ();
        }
 }
@@ -247,10 +241,6 @@ FFmpegEncoder::FileEncoderSet::FileEncoderSet (
        bool three_d,
        boost::filesystem::path output,
        string extension
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-       , optional<dcp::Key> key
-       , optional<string> id
-#endif
        )
 {
        if (three_d) {
@@ -258,31 +248,19 @@ FFmpegEncoder::FileEncoderSet::FileEncoderSet (
                _encoders[EYES_LEFT] = shared_ptr<FFmpegFileEncoder>(
                        new FFmpegFileEncoder(
                                video_frame_size, video_frame_rate, audio_frame_rate, channels, format,
-                               audio_stream_per_channel, x264_crf, String::compose("%1_%2%3", output.string(), _("L"), extension)
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-                                             , key, id
-#endif
-                               )
+                               audio_stream_per_channel, x264_crf, String::compose("%1_%2%3", output.string(), _("L"), extension))
                        );
                /// TRANSLATORS: R here is an abbreviation for "right", to indicate the right-eye part of a 3D export
                _encoders[EYES_RIGHT] = shared_ptr<FFmpegFileEncoder>(
                        new FFmpegFileEncoder(
                                video_frame_size, video_frame_rate, audio_frame_rate, channels, format,
-                               audio_stream_per_channel, x264_crf, String::compose("%1_%2%3", output.string(), _("R"), extension)
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-                                             , key, id
-#endif
-                               )
+                               audio_stream_per_channel, x264_crf, String::compose("%1_%2%3", output.string(), _("R"), extension))
                        );
        } else {
                _encoders[EYES_BOTH]  = shared_ptr<FFmpegFileEncoder>(
                        new FFmpegFileEncoder(
                                video_frame_size, video_frame_rate, audio_frame_rate, channels, format,
-                               audio_stream_per_channel, x264_crf, String::compose("%1%2", output.string(), extension)
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-                                             , key, id
-#endif
-                               )
+                               audio_stream_per_channel, x264_crf, String::compose("%1%2", output.string(), extension))
                        );
        }
 }
@@ -301,7 +279,7 @@ FFmpegEncoder::FileEncoderSet::get (Eyes eyes) const
                }
        }
 
-       map<Eyes, boost::shared_ptr<FFmpegFileEncoder> >::const_iterator i = _encoders.find (eyes);
+       map<Eyes, std::shared_ptr<FFmpegFileEncoder> >::const_iterator i = _encoders.find (eyes);
        DCPOMATIC_ASSERT (i != _encoders.end());
        return i->second;
 }
@@ -309,7 +287,7 @@ FFmpegEncoder::FileEncoderSet::get (Eyes eyes) const
 void
 FFmpegEncoder::FileEncoderSet::flush ()
 {
-       for (map<Eyes, boost::shared_ptr<FFmpegFileEncoder> >::iterator i = _encoders.begin(); i != _encoders.end(); ++i) {
+       for (map<Eyes, std::shared_ptr<FFmpegFileEncoder> >::iterator i = _encoders.begin(); i != _encoders.end(); ++i) {
                i->second->flush ();
        }
 }
@@ -317,7 +295,7 @@ FFmpegEncoder::FileEncoderSet::flush ()
 void
 FFmpegEncoder::FileEncoderSet::audio (shared_ptr<AudioBuffers> a)
 {
-       for (map<Eyes, boost::shared_ptr<FFmpegFileEncoder> >::iterator i = _encoders.begin(); i != _encoders.end(); ++i) {
+       for (map<Eyes, std::shared_ptr<FFmpegFileEncoder> >::iterator i = _encoders.begin(); i != _encoders.end(); ++i) {
                i->second->audio (a);
        }
 }