X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscoder.cc;h=1c8f7e3eb0b021d03f6c62a0076ce4cd41f56188;hb=ff1ab29c3ea270061a54bde529270953e14b9adc;hp=d4c5210dc5dfab2b48af067ebabbb8a959eeabbe;hpb=237a0052c60af768f4d62b00321932918b7ba4d9;p=dcpomatic.git

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index d4c5210dc..1c8f7e3eb 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -36,24 +36,38 @@
 
 using std::string;
 using boost::shared_ptr;
+using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 
+static void
+video_proxy (weak_ptr<Encoder> encoder, shared_ptr<PlayerImage> image, Eyes eyes, ColourConversion conversion, bool same)
+{
+	shared_ptr<Encoder> e = encoder.lock ();
+	if (e) {
+		e->process_video (image, eyes, conversion, same);
+	}
+}
+
+static void
+audio_proxy (weak_ptr<Encoder> encoder, shared_ptr<const AudioBuffers> audio)
+{
+	shared_ptr<Encoder> e = encoder.lock ();
+	if (e) {
+		e->process_audio (audio);
+	}
+}
+
 /** Construct a transcoder using a Decoder that we create and a supplied Encoder.
  *  @param f Film that we are transcoding.
- *  @param j Job that we are running under, or 0.
  *  @param e Encoder to use.
  */
-Transcoder::Transcoder (shared_ptr<Film> f, shared_ptr<Job> j)
-	: _job (j)
-	, _player (f->player ())
+Transcoder::Transcoder (shared_ptr<const Film> f, shared_ptr<Job> j)
+	: _player (f->make_player ())
 	, _encoder (new Encoder (f, j))
+	, _finishing (false)
 {
-	if (!f->with_subtitles ()) {
-		_player->disable_subtitles ();
-	}
-
-	_player->connect_video (_encoder);
-	_player->connect_audio (_encoder);
+	_player->Video.connect (bind (video_proxy, _encoder, _1, _2, _3, _4));
+	_player->Audio.connect (bind (audio_proxy, _encoder, _1));
 }
 
 void
@@ -61,6 +75,8 @@ Transcoder::go ()
 {
 	_encoder->process_begin ();
 	while (!_player->pass ()) {}
+
+	_finishing = true;
 	_encoder->process_end ();
 }
 
@@ -75,3 +91,4 @@ Transcoder::video_frames_out () const
 {
 	return _encoder->video_frames_out ();
 }
+