X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscoder.cc;h=e0f3a03a2319c02de63918a6201647c48fe478cc;hb=546c1c3a19d79968b414fb61a9ab10989d942ae1;hp=87a1fb3f28c8435587e7601b11de13cde3b08a30;hpb=2587f29e54bac098296dbef6557b9bf9bcdc2406;p=dcpomatic.git

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 87a1fb3f2..e0f3a03a2 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -38,7 +38,6 @@
 #include "audio_decoder.h"
 
 using std::string;
-using std::cout;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 
@@ -48,16 +47,16 @@ using boost::dynamic_pointer_cast;
  *  @param j Job that we are running under, or 0.
  *  @param e Encoder to use.
  */
-Transcoder::Transcoder (shared_ptr<Film> f, shared_ptr<const DecodeOptions> o, Job* j, shared_ptr<Encoder> e)
+Transcoder::Transcoder (shared_ptr<Film> f, DecodeOptions o, Job* j, shared_ptr<Encoder> e)
 	: _job (j)
 	, _encoder (e)
-	, _decoders (decoder_factory (f, o, j))
+	, _decoders (decoder_factory (f, o))
 {
 	assert (_encoder);
 
 	if (f->audio_stream()) {
 		shared_ptr<AudioStream> st = f->audio_stream();
-		_matcher.reset (new Matcher (f->log(), st->sample_rate(), f->frames_per_second()));
+		_matcher.reset (new Matcher (f->log(), st->sample_rate(), f->source_frame_rate()));
 		_delay_line.reset (new DelayLine (f->log(), st->channels(), f->audio_delay() * st->sample_rate() / 1000));
 		_gain.reset (new Gain (f->log(), f->audio_gain()));
 	}
@@ -96,7 +95,9 @@ Transcoder::go ()
 		while (1) {
 			if (!done[0]) {
 				done[0] = _decoders.video->pass ();
-				_decoders.video->set_progress ();
+				if (_job) {
+					_decoders.video->set_progress (_job);
+				}
 			}
 
 			if (!done[1] && _decoders.audio && dynamic_pointer_cast<Decoder> (_decoders.audio) != dynamic_pointer_cast<Decoder> (_decoders.video)) {