X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscoder.cc;h=e0f3a03a2319c02de63918a6201647c48fe478cc;hb=ba0a895137b630f5d308b123ef886d68090f855d;hp=a7e79b05f74d6338cd2c5debfe6d77381b905839;hpb=3ce37f08e98b9c3a238fb1c9a6184fb7fd4e5667;p=dcpomatic.git

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index a7e79b05f..e0f3a03a2 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -38,45 +38,44 @@
 #include "audio_decoder.h"
 
 using std::string;
-using std::cout;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 
 /** Construct a transcoder using a Decoder that we create and a supplied Encoder.
  *  @param f Film that we are transcoding.
- *  @param o Options.
+ *  @param o Decode options.
  *  @param j Job that we are running under, or 0.
  *  @param e Encoder to use.
  */
-Transcoder::Transcoder (shared_ptr<Film> f, shared_ptr<const Options> 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()));
 	}
 
 	/* Set up the decoder to use the film's set streams */
-	_decoders.first->set_subtitle_stream (f->subtitle_stream ());
-	if (_decoders.second) {
-		_decoders.second->set_audio_stream (f->audio_stream ());
+	_decoders.video->set_subtitle_stream (f->subtitle_stream ());
+	if (_decoders.audio) {
+		_decoders.audio->set_audio_stream (f->audio_stream ());
 	}
 
 	if (_matcher) {
-		_decoders.first->connect_video (_matcher);
+		_decoders.video->connect_video (_matcher);
 		_matcher->connect_video (_encoder);
 	} else {
-		_decoders.first->connect_video (_encoder);
+		_decoders.video->connect_video (_encoder);
 	}
 	
-	if (_matcher && _delay_line && _decoders.second) {
-		_decoders.second->connect_audio (_delay_line);
+	if (_matcher && _delay_line && _decoders.audio) {
+		_decoders.audio->connect_audio (_delay_line);
 		_delay_line->connect_audio (_matcher);
 		_matcher->connect_audio (_gain);
 		_gain->connect_audio (_encoder);
@@ -95,12 +94,14 @@ Transcoder::go ()
 		
 		while (1) {
 			if (!done[0]) {
-				done[0] = _decoders.first->pass ();
-				_decoders.first->set_progress ();
+				done[0] = _decoders.video->pass ();
+				if (_job) {
+					_decoders.video->set_progress (_job);
+				}
 			}
 
-			if (!done[1] && _decoders.second && dynamic_pointer_cast<Decoder> (_decoders.second) != dynamic_pointer_cast<Decoder> (_decoders.first)) {
-				done[1] = _decoders.second->pass ();
+			if (!done[1] && _decoders.audio && dynamic_pointer_cast<Decoder> (_decoders.audio) != dynamic_pointer_cast<Decoder> (_decoders.video)) {
+				done[1] = _decoders.audio->pass ();
 			} else {
 				done[1] = true;
 			}