X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_encoder.cc;h=3a4a793a87c5fdcfa35c5a1db3b150ce88440a07;hb=dc87773c69beb0249c1d50841730a10a496b563a;hp=a3708040596c3c3aa9173f5e7e317fc03b094560;hpb=666d0b238f32c0383068d3d8f3936f46c4e67a14;p=dcpomatic.git

diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc
index a37080405..3a4a793a8 100644
--- a/src/lib/dcp_encoder.cc
+++ b/src/lib/dcp_encoder.cc
@@ -56,12 +56,14 @@ using boost::dynamic_pointer_cast;
  */
 DCPEncoder::DCPEncoder (shared_ptr<const Film> film, weak_ptr<Job> job)
 	: Encoder (film, job)
-	, _writer (new Writer (film, job))
-	, _j2k_encoder (new J2KEncoder (film, _writer))
 	, _finishing (false)
 	, _non_burnt_subtitles (false)
 {
-	BOOST_FOREACH (shared_ptr<const Content> c, _film->content ()) {
+	_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_subtitle_connection = _player->Subtitle.connect (bind (&DCPEncoder::subtitle, this, _1, _2));
+
+	BOOST_FOREACH (shared_ptr<const Content> c, film->content ()) {
 		if (c->subtitle && c->subtitle->use() && !c->subtitle->burn()) {
 			_non_burnt_subtitles = true;
 		}
@@ -79,7 +81,10 @@ DCPEncoder::~DCPEncoder ()
 void
 DCPEncoder::go ()
 {
+	_writer.reset (new Writer (_film, _job));
 	_writer->start ();
+
+	_j2k_encoder.reset (new J2KEncoder (_film, _writer));
 	_j2k_encoder->begin ();
 
 	{
@@ -117,7 +122,7 @@ DCPEncoder::video (shared_ptr<PlayerVideo> data, DCPTime time)
 void
 DCPEncoder::audio (shared_ptr<AudioBuffers> data, DCPTime time)
 {
-	_writer->write (data);
+	_writer->write (data, time);
 
 	shared_ptr<Job> job = _job.lock ();
 	DCPOMATIC_ASSERT (job);
@@ -135,11 +140,19 @@ DCPEncoder::subtitle (PlayerSubtitles data, DCPTimePeriod period)
 float
 DCPEncoder::current_rate () const
 {
+	if (!_j2k_encoder) {
+		return 0;
+	}
+
 	return _j2k_encoder->current_encoding_rate ();
 }
 
 Frame
 DCPEncoder::frames_done () const
 {
+	if (!_j2k_encoder) {
+		return 0;
+	}
+
 	return _j2k_encoder->video_frames_enqueued ();
 }