Allow Collators to have their language specified, and specify it for tests.

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

diff --git a/src/lib/subtitle_encoder.cc b/src/lib/subtitle_encoder.cc
index ba47e1231067f917e2ada7e160c3c2e21302aa94..51b9963bc02a168d1988120f586b93625faa0769 100644 (file)
--- a/src/lib/subtitle_encoder.cc
+++ b/src/lib/subtitle_encoder.cc
@@ -20,7 +20,6 @@
 
 
 #include "compose.hpp"
-#include "font_data.h"
 #include "job.h"
 #include "player.h"
 #include "subtitle_encoder.h"
@@ -57,10 +56,10 @@ SubtitleEncoder::SubtitleEncoder (shared_ptr<const Film> film, shared_ptr<Job> j
        , _reel_index (0)
        , _length (film->length())
 {
-       _player->set_play_referenced ();
-       _player->set_ignore_video ();
-       _player->set_ignore_audio ();
-       _player->Text.connect (boost::bind(&SubtitleEncoder::text, this, _1, _2, _3, _4));
+       _player.set_play_referenced();
+       _player.set_ignore_video();
+       _player.set_ignore_audio();
+       _player.Text.connect(boost::bind(&SubtitleEncoder::text, this, _1, _2, _3, _4));
 
        string const extension = film->interop() ? ".xml" : ".mxf";
 
@@ -100,7 +99,7 @@ SubtitleEncoder::go ()
 
        _reel_index = 0;
 
-       while (!_player->pass()) {}
+       while (!_player.pass()) {}
 
        int reel = 0;
        for (auto& i: _assets) {
@@ -120,8 +119,8 @@ SubtitleEncoder::go ()
                }
 
                if (!_film->interop() || _include_font) {
-                       for (auto j: _player->get_subtitle_fonts()) {
-                               i.first->add_font (j.id, _default_font);
+                       for (auto j: _player.get_subtitle_fonts()) {
+                               i.first->add_font(j->id(), j->data().get_value_or(_default_font));
                        }
                }