Fix 3D DCP handling in the player.

diff --git a/ChangeLog b/ChangeLog
index 4a6285ba05cd8357cbba77c9f01b390a05b29301..d9681488adaa6d8f21e9169423bcbfd2783fe5f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-04-11  Carl Hetherington  <cth@carlh.net>
+
+       * Fix 3D DCP handling in the player.
+
 2018-04-10  Carl Hetherington  <cth@carlh.net>
 
        * Fix disappearing subtitles when they are added from text files

diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h
index 371ec7fff2cfbc3bdcd0803536f483f29459e4c7..64642623fe7b6dc8cfaca3278ada168802d836ba 100644 (file)
--- a/src/lib/dcp_content.h
+++ b/src/lib/dcp_content.h
@@ -129,6 +129,11 @@ public:
                return _name;
        }
 
+       bool three_d () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _three_d;
+       }
+
 private:
        friend class reels_test5;
 

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index d7e47081c92d03105f484c247d074af0e44d8eb1..9b45affd2a5c5576be947c29893fded65a541be0 100644 (file)
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -217,6 +217,10 @@ public:
                        dcp->subtitle->set_use (true);
                }
 
+               if (dcp->three_d()) {
+                       _film->set_three_d (true);
+               }
+
                Ratio const * r = Ratio::nearest_from_ratio(dcp->video->size().ratio());
                if (r) {
                        _film->set_container(r);