X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Ftranscoder.cc;h=7022965bd47d5e7bd13d7386b9045758c44fc928;hb=86461ade4087f8473c1e8b063907d92884813843;hp=f4637a05cf1c0f983d9a26bff6edca680b6f5d39;hpb=5fd5e78c51bd5630f6777001db5aa25103218c22;p=dcpomatic.git

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index f4637a05c..7022965bd 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -36,8 +36,27 @@
 
 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<const Image> image, bool same)
+{
+	shared_ptr<Encoder> e = encoder.lock ();
+	if (e) {
+		e->process_video (image, 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.
@@ -45,11 +64,11 @@ using boost::dynamic_pointer_cast;
  */
 Transcoder::Transcoder (shared_ptr<const Film> f, shared_ptr<Job> j)
 	: _job (j)
-	, _player (f->player ())
+	, _player (f->make_player ())
 	, _encoder (new Encoder (f, j))
 {
-	_player->connect_video (_encoder);
-	_player->connect_audio (_encoder);
+	_player->Video.connect (bind (video_proxy, _encoder, _1, _2));
+	_player->Audio.connect (bind (audio_proxy, _encoder, _1));
 }
 
 void