Fix bugs caught by tests.

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

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index b74d09174ee1a53f6d77dab2e7864691559ef605..9515a43449ba730f6bba81394d92c5f144bb8cc0 100644 (file)
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -18,37 +18,36 @@
 */
 
 /** @file  src/transcoder.cc
- *  @brief A class which takes a FilmState and some Options, then uses those to transcode a Film.
+ *  @brief A class which takes a Film and some Options, then uses those to transcode the film.
  *
  *  A decoder is selected according to the content type, and the encoder can be specified
  *  as a parameter to the constructor.
  */
 
 #include <iostream>
-#include <sigc++/signal.h>
+#include <boost/signals2.hpp>
 #include "transcoder.h"
 #include "encoder.h"
 #include "decoder_factory.h"
 
-using namespace std;
-using namespace boost;
+using std::string;
+using boost::shared_ptr;
 
 /** Construct a transcoder using a Decoder that we create and a supplied Encoder.
- *  @param s FilmState of Film that we are transcoding.
+ *  @param f Film that we are transcoding.
  *  @param o Options.
  *  @param j Job that we are running under, or 0.
- *  @param l Log that we can write to.
  *  @param e Encoder to use.
  */
-Transcoder::Transcoder (shared_ptr<const FilmState> s, shared_ptr<const Options> o, Job* j, Log* l, shared_ptr<Encoder> e)
+Transcoder::Transcoder (shared_ptr<Film> f, shared_ptr<const Options> o, Job* j, shared_ptr<Encoder> e)
        : _job (j)
        , _encoder (e)
-       , _decoder (decoder_factory (s, o, j, l))
+       , _decoder (decoder_factory (f, o, j))
 {
        assert (_encoder);
        
-       _decoder->Video.connect (sigc::mem_fun (*e, &Encoder::process_video));
-       _decoder->Audio.connect (sigc::mem_fun (*e, &Encoder::process_audio));
+       _decoder->Video.connect (bind (&Encoder::process_video, e, _1, _2, _3));
+       _decoder->Audio.connect (bind (&Encoder::process_audio, e, _1));
 }
 
 /** Run the decoder, passing its output to the encoder, until the decoder
@@ -57,7 +56,7 @@ Transcoder::Transcoder (shared_ptr<const FilmState> s, shared_ptr<const Options>
 void
 Transcoder::go ()
 {
-       _encoder->process_begin (_decoder->audio_channel_layout(), _decoder->audio_sample_format());
+       _encoder->process_begin (_decoder->audio_channel_layout());
        try {
                _decoder->go ();
        } catch (...) {