Include tidying.

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

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 3ecc3a064bb2b476ab41016e6c4d7083e1cfd72d..ad8e4ab9be7c43f834eac17be7d4486827f82c7f 100644 (file)
--- 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,10 @@
 #include "player.h"
 #include "job.h"
 #include "writer.h"
+#include "subtitle_content.h"
+#include <boost/signals2.hpp>
+#include <boost/foreach.hpp>
+#include <iostream>
 
 using std::string;
 using std::cout;
@@ -48,7 +50,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)
@@ -64,7 +66,20 @@ Transcoder::go ()
        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 ());
        }
 
@@ -74,16 +89,14 @@ Transcoder::go ()
                        _encoder->enqueue (*i);
                }
                _writer->write (_player->get_audio (t, frame, true));
-               if (!_film->burn_subtitles ()) {
-                       _writer->write (_player->get_subtitles (t, frame, true));
+               if (non_burnt_subtitles) {
+                       _writer->write (_player->get_subtitles (t, frame, true, false));
                }
        }
 
        _finishing = true;
        _encoder->end ();
        _writer->finish ();
-
-       _player->statistics().dump (_film->log ());
 }
 
 float
@@ -97,4 +110,3 @@ Transcoder::video_frames_out () const
 {
        return _encoder->video_frames_out ();
 }
-