diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-06-14 12:11:50 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-06-14 12:11:50 +0100 |
| commit | 3ae21bc7e7e0278a1ee15d365971eeb3dcabcbf6 (patch) | |
| tree | dc231aeb0f9d31e6e3e04888b4302130953385e4 /src/lib/dcp_content.cc | |
| parent | b19543a036c389c9970a65f77606afb55d9fd11d (diff) | |
Set correct video frame type when importing DCPs (part of #806).
Diffstat (limited to 'src/lib/dcp_content.cc')
| -rw-r--r-- | src/lib/dcp_content.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index b46b3dab7..295f33b3c 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -63,6 +63,7 @@ DCPContent::DCPContent (shared_ptr<const Film> film, boost::filesystem::path p) , _reference_video (false) , _reference_audio (false) , _reference_subtitle (false) + , _three_d (false) { video.reset (new VideoContent (this)); audio.reset (new AudioContent (this)); @@ -108,6 +109,7 @@ DCPContent::DCPContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, in DCPOMATIC_ASSERT (false); } } + _three_d = node->optional_bool_child("ThreeD").get_value_or (false); } void @@ -155,11 +157,14 @@ DCPContent::examine (shared_ptr<Job> job) _encrypted = examiner->encrypted (); _kdm_valid = examiner->kdm_valid (); _standard = examiner->standard (); + _three_d = examiner->three_d (); } if (could_be_played != can_be_played ()) { signal_changed (DCPContentProperty::CAN_BE_PLAYED); } + + video->set_frame_type (_three_d ? VIDEO_FRAME_TYPE_3D : VIDEO_FRAME_TYPE_2D); } string @@ -221,6 +226,7 @@ DCPContent::as_xml (xmlpp::Node* node) const DCPOMATIC_ASSERT (false); } } + node->add_child("ThreeD")->add_child_text (_three_d ? "1" : "0"); } DCPTime |