Merge.

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

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index ef3a0e8c1af6c52edcd2920fab34861b8220e457..d4c5210dc5dfab2b48af067ebabbb8a959eeabbe 100644 (file)
--- 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 "playlist.h"
+#include "player.h"
+#include "job.h"
 
 using std::string;
 using boost::shared_ptr;
@@ -48,55 +46,21 @@ using boost::dynamic_pointer_cast;
 Transcoder::Transcoder (shared_ptr<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 (!f->with_subtitles ()) {
+               _player->disable_subtitles ();
        }
 
-       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 ();
 }