X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_encoder.cc;h=9a840c8ab916b6a594f4e6881f223ad20346f4f5;hb=HEAD;hp=16a99e79e0ff28563c8d9546641b83ee10014d50;hpb=bfd6bd32b5e20c479170452a66cb44eff59feacd;p=dcpomatic.git

diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc
index 16a99e79e..a4bc133f8 100644
--- a/src/lib/dcp_encoder.cc
+++ b/src/lib/dcp_encoder.cc
@@ -68,10 +68,10 @@ DCPEncoder::DCPEncoder (shared_ptr<const Film> film, weak_ptr<Job> job)
 	, _finishing (false)
 	, _non_burnt_subtitles (false)
 {
-	_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));
+	_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));
 
 	for (auto c: film->content ()) {
 		for (auto i: c->text) {
@@ -104,10 +104,17 @@ DCPEncoder::go ()
 	}
 
 	if (_non_burnt_subtitles) {
-		_writer.write(_player->get_subtitle_fonts());
+		_writer.write(_player.get_subtitle_fonts());
 	}
 
-	while (!_player->pass ()) {}
+	int passes = 0;
+	while (!_player.pass()) {
+		if ((++passes % 8) == 0) {
+			auto job = _job.lock();
+			DCPOMATIC_ASSERT(job);
+			job->set_progress(_player.progress());
+		}
+	}
 
 	for (auto i: get_referenced_reel_assets(_film, _film->playlist())) {
 		_writer.write(i);
@@ -128,10 +135,6 @@ void
 DCPEncoder::audio (shared_ptr<AudioBuffers> data, DCPTime time)
 {
 	_writer.write(data, time);
-
-	auto job = _job.lock ();
-	DCPOMATIC_ASSERT (job);
-	job->set_progress (float(time.get()) / _film->length().get());
 }
 
 void
@@ -159,5 +162,5 @@ DCPEncoder::current_rate () const
 Frame
 DCPEncoder::frames_done () const
 {
-	return _j2k_encoder.video_frames_enqueued();
+	return _player.frames_done();
 }