From 3db036afaaab4e51bc41224784bf79036a4ff037 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 11 Apr 2018 00:29:58 +0100 Subject: Fix 3D DCP handling in the player. --- ChangeLog | 4 ++++ src/lib/dcp_content.h | 5 +++++ src/tools/dcpomatic_player.cc | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index 142333c10..ac082c90f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2018-04-11 Carl Hetherington + + * Fix 3D DCP handling in the player. + 2018-04-05 Carl Hetherington * 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); -- cgit v1.2.3