Move get_reel_assets() out of Player, as it doesn't need to be there.

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

diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc
index f1c41253984f514563735b62580399711e4042f4..e4cb76d792712064498be8f858573c271fd6b7be 100644 (file)
--- a/src/lib/dcp_encoder.cc
+++ b/src/lib/dcp_encoder.cc
@@ -104,23 +104,12 @@ DCPEncoder::go ()
        }
 
        if (_non_burnt_subtitles) {
-               auto fonts = _player->get_subtitle_fonts ();
-
-               if (fonts.size() > 1 && _film->interop()) {
-                       /* Interop will ignore second and subsequent <LoadFont>s so don't even
-                          write them as they upset some validators.
-                       */
-                       auto first = fonts.front();
-                       fonts.clear ();
-                       fonts.push_back (first);
-               }
-
-               _writer->write (fonts);
+               _writer->write(_player->get_subtitle_fonts());
        }
 
        while (!_player->pass ()) {}
 
-       for (auto i: _player->get_reel_assets()) {
+       for (auto i: get_referenced_reel_assets(_film, _film->playlist())) {
                _writer->write (i);
        }