Rename video/audio/subtitle part methods.

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

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 49742f98d551b12b6168f0d54d0b8f1c937a679b..ba004d634f4b6c7d2e933ce080e82b9dbfb10df3 100644 (file)
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -33,6 +33,7 @@
 #include "job.h"
 #include "writer.h"
 #include "compose.hpp"
+#include "referenced_reel_asset.h"
 #include "subtitle_content.h"
 #include <boost/signals2.hpp>
 #include <boost/foreach.hpp>
@@ -53,7 +54,7 @@ Transcoder::Transcoder (shared_ptr<const Film> film, shared_ptr<Job> j)
        : _film (film)
        , _player (new Player (film, film->playlist ()))
        , _writer (new Writer (film, j))
-       , _encoder (new Encoder (film, j, _writer))
+       , _encoder (new Encoder (film, _writer))
        , _finishing (false)
 {
 
@@ -71,9 +72,8 @@ Transcoder::go ()
        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()) {
+               if (c->subtitle && c->subtitle->use()) {
+                       if (c->subtitle->burn()) {
                                ++burnt_subtitles;
                        } else {
                                ++non_burnt_subtitles;
@@ -86,23 +86,15 @@ Transcoder::go ()
        }
 
        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);
-               }
-
-               shared_ptr<AudioBuffers> audio = _player->get_audio (t, frame, true);
-               if (audio) {
-                       _writer->write (audio);
-               }
+               _encoder->encode (_player->get_video (t, true));
+               _writer->write (_player->get_audio (t, frame, true));
 
                if (non_burnt_subtitles) {
-                       _writer->write (_player->get_subtitles (t, frame, true, false));
+                       _writer->write (_player->get_subtitles (t, frame, true, false, true));
                }
        }
 
-       /* XXX: we should be passing through details of positions, at least... */
-       BOOST_FOREACH (shared_ptr<dcp::ReelAsset> i, _player->get_reel_assets ()) {
+       BOOST_FOREACH (ReferencedReelAsset i, _player->get_reel_assets ()) {
                _writer->write (i);
        }