X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscoder.cc;h=f4637a05cf1c0f983d9a26bff6edca680b6f5d39;hb=50cb31af16240b248700dab1484d7f07656c66df;hp=6744e9193ce9d415d1ad36eeceedd9f52f25ac83;hpb=e94cd129dcd66a76210880bfdf19d27f7992651b;p=dcpomatic.git

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 6744e9193..f4637a05c 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -29,12 +29,10 @@
 #include "transcoder.h"
 #include "encoder.h"
 #include "film.h"
-#include "matcher.h"
-#include "delay_line.h"
-#include "gain.h"
 #include "video_decoder.h"
 #include "audio_decoder.h"
 #include "player.h"
+#include "job.h"
 
 using std::string;
 using boost::shared_ptr;
@@ -45,58 +43,20 @@ 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<Job> j)
+Transcoder::Transcoder (shared_ptr<const Film> f, shared_ptr<Job> j)
 	: _job (j)
 	, _player (f->player ())
-	, _encoder (new Encoder (f))
+	, _encoder (new Encoder (f, j))
 {
-	if (f->has_audio ()) {
-		_matcher.reset (new Matcher (f->log(), f->audio_frame_rate(), f->video_frame_rate()));
-		_delay_line.reset (new DelayLine (f->log(), f->audio_channels(), f->audio_delay() * f->audio_frame_rate() / 1000));
-		_gain.reset (new Gain (f->log(), f->audio_gain()));
-	}
-
-	if (_matcher) {
-		_player->connect_video (_matcher);
-		_matcher->connect_video (_encoder);
-	} else {
-		_player->connect_video (_encoder);
-	}
-	
-	if (_matcher && _delay_line && f->has_audio ()) {
-		_player->connect_audio (_delay_line);
-		_delay_line->connect_audio (_matcher);
-		_matcher->connect_audio (_gain);
-		_gain->connect_audio (_encoder);
-	}
+	_player->connect_video (_encoder);
+	_player->connect_audio (_encoder);
 }
 
 void
 Transcoder::go ()
 {
 	_encoder->process_begin ();
-	try {
-		while (1) {
-			if (_player->pass ()) {
-				break;
-			}
-			_player->set_progress (_job);
-		}
-		
-	} catch (...) {
-		_encoder->process_end ();
-		throw;
-	}
-	
-	if (_delay_line) {
-		_delay_line->process_end ();
-	}
-	if (_matcher) {
-		_matcher->process_end ();
-	}
-	if (_gain) {
-		_gain->process_end ();
-	}
+	while (!_player->pass ()) {}
 	_encoder->process_end ();
 }