Updated zh_CN translation from Danbo Song.

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

diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc
index 2fcad68fe3c6fa14494f120177b479fc76e36dac..80647c2fa2a526ef9add52b770498e08f6c2b529 100644 (file)
--- a/src/lib/ffmpeg_encoder.cc
+++ b/src/lib/ffmpeg_encoder.cc
@@ -79,8 +79,8 @@ FFmpegEncoder::FFmpegEncoder (
                Butler::Audio::ENABLED
                )
 {
-       _player->set_always_burn_open_subtitles ();
-       _player->set_play_referenced ();
+       _player.set_always_burn_open_subtitles();
+       _player.set_play_referenced();
 }
 
 
@@ -178,9 +178,9 @@ FFmpegEncoder::go ()
        std::vector<float> interleaved(_output_audio_channels * audio_frames);
        auto deinterleaved = make_shared<AudioBuffers>(_output_audio_channels, audio_frames);
        int const gets_per_frame = _film->three_d() ? 2 : 1;
-       for (DCPTime i; i < _film->length(); i += video_frame) {
+       for (DCPTime time; time < _film->length(); time += video_frame) {
 
-               if (file_encoders.size() > 1 && !reel->contains(i)) {
+               if (file_encoders.size() > 1 && !reel->contains(time)) {
                        /* Next reel and file */
                        ++reel;
                        ++encoder;
@@ -190,12 +190,12 @@ FFmpegEncoder::go ()
 
                for (int j = 0; j < gets_per_frame; ++j) {
                        Butler::Error e;
-                       auto v = _butler.get_video(Butler::Behaviour::BLOCKING, &e);
+                       auto video = _butler.get_video(Butler::Behaviour::BLOCKING, &e);
                        _butler.rethrow();
-                       if (v.first) {
-                               auto fe = encoder->get (v.first->eyes());
+                       if (video.first) {
+                               auto fe = encoder->get(video.first->eyes());
                                if (fe) {
-                                       fe->video(v.first, v.second - reel->from);
+                                       fe->video(video.first, video.second - reel->from);
                                }
                        } else {
                                if (e.code != Butler::Error::Code::FINISHED) {
@@ -208,12 +208,12 @@ FFmpegEncoder::go ()
 
                {
                        boost::mutex::scoped_lock lm (_mutex);
-                       _last_time = i;
+                       _last_time = time;
                }
 
                auto job = _job.lock ();
                if (job) {
-                       job->set_progress (float(i.get()) / _film->length().get());
+                       job->set_progress(float(time.get()) / _film->length().get());
                }
 
                waker.nudge ();