summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-04-11 00:29:58 +0100
committerCarl Hetherington <cth@carlh.net>2018-04-11 00:31:17 +0100
commit3db036afaaab4e51bc41224784bf79036a4ff037 (patch)
treed9743eef3e8e44bb97aa043a8689c95401bec607
parentd7880690e9e6dba3c82cd0e78e32862a1ec43666 (diff)
Fix 3D DCP handling in the player.
-rw-r--r--ChangeLog4
-rw-r--r--src/lib/dcp_content.h5
-rw-r--r--src/tools/dcpomatic_player.cc4
3 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 142333c10..ac082c90f 100644
--- 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 892b6aa73..6a408299b 100644
--- 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 d42320bfd..65186d88a 100644
--- 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);