Rearrange subtitle font management.

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

diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc
index c5bcf31f2c207ce25d65ab97ea577f719681bed7..e3443c1ad83bcfa43073e2d933a2a40137ad9289 100644 (file)
--- a/src/lib/dcp_encoder.cc
+++ b/src/lib/dcp_encoder.cc
@@ -104,18 +104,7 @@ 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 ()) {}
@@ -132,16 +121,6 @@ DCPEncoder::go ()
 void
 DCPEncoder::video (shared_ptr<PlayerVideo> data, DCPTime time)
 {
-       if (!_film->three_d()) {
-               if (data->eyes() == Eyes::LEFT) {
-                       /* Use left-eye images for both eyes... */
-                       data->set_eyes (Eyes::BOTH);
-               } else if (data->eyes() == Eyes::RIGHT) {
-                       /* ...and discard the right */
-                       return;
-               }
-       }
-
        _j2k_encoder->encode (data, time);
 }