Cleanup: remove unused parameter to PlayerVideo::force.

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

diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc
index e1081f5185f24d45b2dc0b74a84eee2909b6609b..8f36bbda1a7b58ea3a9e738ade3caad0d11a0f64 100644 (file)
--- a/src/lib/ffmpeg_encoder.cc
+++ b/src/lib/ffmpeg_encoder.cc
@@ -108,7 +108,7 @@ FFmpegEncoder::FFmpegEncoder (
        }
 
        _butler = std::make_shared<Butler>(
-               _film, _player, map, _output_audio_channels, bind(&PlayerVideo::force, _1, FFmpegFileEncoder::pixel_format(format)), VideoRange::VIDEO, Image::Alignment::PADDED, false, false
+               _film, _player, map, _output_audio_channels, bind(&PlayerVideo::force, FFmpegFileEncoder::pixel_format(format)), VideoRange::VIDEO, Image::Alignment::PADDED, false, false
                );
 }
 
@@ -204,7 +204,7 @@ FFmpegEncoder::go ()
 
                waker.nudge ();
 
-               _butler->get_audio (interleaved, audio_frames);
+               _butler->get_audio (Butler::Behaviour::BLOCKING, interleaved, audio_frames);
                /* XXX: inefficient; butler interleaves and we deinterleave again */
                float* p = interleaved;
                for (int j = 0; j < audio_frames; ++j) {