std::shared_ptr

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

diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc
index 1d8feffa8f4ed369ae177eabc85ce91d1511c9a3..4e1f0bcb59ca5f57115d8de3bdf80ae8996d06b3 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
@@ -107,7 +107,7 @@ FFmpegEncoder::FFmpegEncoder (
        }
 
        _butler.reset (
-               new Butler(_player, map, _output_audio_channels, bind(&PlayerVideo::force, _1, FFmpegFileEncoder::pixel_format(format)), VIDEO_RANGE_VIDEO, true, false)
+               new Butler(_film, _player, map, _output_audio_channels, bind(&PlayerVideo::force, _1, FFmpegFileEncoder::pixel_format(format)), VIDEO_RANGE_VIDEO, true, false)
                );
 }
 
@@ -279,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;
 }
@@ -287,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 ();
        }
 }
@@ -295,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);
        }
 }