Differentiate requested and actual crop.

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

diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc
index 4b4785cc6e362021cab8c4ba6c8cada370810c23..f1c41253984f514563735b62580399711e4042f4 100644 (file)
--- a/src/lib/dcp_encoder.cc
+++ b/src/lib/dcp_encoder.cc
@@ -132,16 +132,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);
 }
 
@@ -158,7 +148,7 @@ DCPEncoder::audio (shared_ptr<AudioBuffers> data, DCPTime time)
 void
 DCPEncoder::text (PlayerText data, TextType type, optional<DCPTextTrack> track, DCPTimePeriod period)
 {
-       if (type == TEXT_CLOSED_CAPTION || _non_burnt_subtitles) {
+       if (type == TextType::CLOSED_CAPTION || _non_burnt_subtitles) {
                _writer->write (data, type, track, period);
        }
 }