X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftranscoder.cc;h=49742f98d551b12b6168f0d54d0b8f1c937a679b;hb=c53bf2c0860f6b0ff583ad9f4bc4c7e86d47fa94;hp=4ff0c6dfe0ae7397ad90121ea6808f5568bd31fd;hpb=53eea12d3e0d7925d5949de92859bc358ee0adcc;p=dcpomatic.git

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 4ff0c6dfe..49742f98d 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -24,8 +24,6 @@
  *  as a parameter to the constructor.
  */
 
-#include <iostream>
-#include <boost/signals2.hpp>
 #include "transcoder.h"
 #include "encoder.h"
 #include "film.h"
@@ -34,6 +32,11 @@
 #include "player.h"
 #include "job.h"
 #include "writer.h"
+#include "compose.hpp"
+#include "subtitle_content.h"
+#include <boost/signals2.hpp>
+#include <boost/foreach.hpp>
+#include <iostream>
 
 using std::string;
 using std::cout;
@@ -48,7 +51,7 @@ using boost::dynamic_pointer_cast;
  */
 Transcoder::Transcoder (shared_ptr<const Film> film, shared_ptr<Job> j)
 	: _film (film)
-	, _player (new Player (film))
+	, _player (new Player (film, film->playlist ()))
 	, _writer (new Writer (film, j))
 	, _encoder (new Encoder (film, j, _writer))
 	, _finishing (false)
@@ -59,31 +62,53 @@ Transcoder::Transcoder (shared_ptr<const Film> film, shared_ptr<Job> j)
 void
 Transcoder::go ()
 {
+	_writer->start ();
 	_encoder->begin ();
 
 	DCPTime const frame = DCPTime::from_frames (1, _film->video_frame_rate ());
 	DCPTime const length = _film->length ();
 
-	if (!_film->burn_subtitles ()) {
+	int burnt_subtitles = 0;
+	int non_burnt_subtitles = 0;
+	BOOST_FOREACH (shared_ptr<const Content> c, _film->content ()) {
+		shared_ptr<const SubtitleContent> sc = dynamic_pointer_cast<const SubtitleContent> (c);
+		if (sc && sc->use_subtitles()) {
+			if (sc->burn_subtitles()) {
+				++burnt_subtitles;
+			} else {
+				++non_burnt_subtitles;
+			}
+		}
+	}
+
+	if (non_burnt_subtitles) {
 		_writer->write (_player->get_subtitle_fonts ());
 	}
-	
+
 	for (DCPTime t; t < length; t += frame) {
 		list<shared_ptr<PlayerVideo> > v = _player->get_video (t, true);
 		for (list<shared_ptr<PlayerVideo> >::const_iterator i = v.begin(); i != v.end(); ++i) {
 			_encoder->enqueue (*i);
 		}
-		_writer->write (_player->get_audio (t, frame, true));
-		if (!_film->burn_subtitles ()) {
-			_writer->write (_player->get_subtitles (t, frame, true));
+
+		shared_ptr<AudioBuffers> audio = _player->get_audio (t, frame, true);
+		if (audio) {
+			_writer->write (audio);
+		}
+
+		if (non_burnt_subtitles) {
+			_writer->write (_player->get_subtitles (t, frame, true, false));
 		}
 	}
 
+	/* XXX: we should be passing through details of positions, at least... */
+	BOOST_FOREACH (shared_ptr<dcp::ReelAsset> i, _player->get_reel_assets ()) {
+		_writer->write (i);
+	}
+
 	_finishing = true;
 	_encoder->end ();
 	_writer->finish ();
-
-	_player->statistics().dump (_film->log ());
 }
 
 float
@@ -97,4 +122,3 @@ Transcoder::video_frames_out () const
 {
 	return _encoder->video_frames_out ();
 }
-