Merge 1.0 in.

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

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 7022965bd47d5e7bd13d7386b9045758c44fc928..63ba77939f2cf7ca033286c6ee88a575fa698aa4 100644 (file)
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -40,11 +40,11 @@ using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 
 static void
-video_proxy (weak_ptr<Encoder> encoder, shared_ptr<const Image> image, bool same)
+video_proxy (weak_ptr<Encoder> encoder, shared_ptr<const Image> image, Eyes eyes, ColourConversion conversion, bool same)
 {
        shared_ptr<Encoder> e = encoder.lock ();
        if (e) {
-               e->process_video (image, same);
+               e->process_video (image, eyes, conversion, same);
        }
 }
 
@@ -67,7 +67,7 @@ Transcoder::Transcoder (shared_ptr<const Film> f, shared_ptr<Job> j)
        , _player (f->make_player ())
        , _encoder (new Encoder (f, j))
 {
-       _player->Video.connect (bind (video_proxy, _encoder, _1, _2));
+       _player->Video.connect (bind (video_proxy, _encoder, _1, _2, _3, _4));
        _player->Audio.connect (bind (audio_proxy, _encoder, _1));
 }
 
@@ -90,3 +90,9 @@ Transcoder::video_frames_out () const
 {
        return _encoder->video_frames_out ();
 }
+
+Encoder::State
+Transcoder::state () const
+{
+       return _encoder->state ();
+}