Fix 3D DCP handling in the player.

diff --git a/ChangeLog b/ChangeLog
index 142333c1038858b38e876fd28673b5ceffd7447f..ac082c90f23c464e3669353ef22006871388bc7e 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-05  Carl Hetherington  <cth@carlh.net>
 
        * Updated zh_CN translation from 刘汉源.

diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h
index 892b6aa735f7cb3fc589dc416400ede1defeab90..6a408299b817fdff84243793d51fbd095c4828f1 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 d42320bfdd383c527af1a0170c15fd41e288306a..65186d88a7b96dd5c1f954e18f7bfe05c32ad696 100644 (file)
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -189,6 +189,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);