Rename TYPE_DEBUG_PLAYER to TYPE_DEBUG_VIDEO_VIEW.

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

diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc
index 99edb005066524cc683fd2a24a00f1df5cb87204..d17c6c985b07bd1f5529e75adddae38c78b0fe45 100644 (file)
--- a/src/lib/dcp_encoder.cc
+++ b/src/lib/dcp_encoder.cc
@@ -126,9 +126,14 @@ DCPEncoder::go ()
 void
 DCPEncoder::video (shared_ptr<PlayerVideo> data, DCPTime time)
 {
-       if (!_film->three_d() && data->eyes() == EYES_LEFT) {
-               /* Use left-eye images for both eyes */
-               data->set_eyes (EYES_BOTH);
+       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);
@@ -152,11 +157,11 @@ DCPEncoder::text (PlayerText data, TextType type, optional<DCPTextTrack> track,
        }
 }
 
-float
+optional<float>
 DCPEncoder::current_rate () const
 {
        if (!_j2k_encoder) {
-               return 0;
+               return optional<float>();
        }
 
        return _j2k_encoder->current_encoding_rate ();