/*
Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ DCP-o-matic is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
, _reference_video (false)
, _reference_audio (false)
, _reference_subtitle (false)
+ , _three_d (false)
{
video.reset (new VideoContent (this));
audio.reset (new AudioContent (this));
: Content (film, node)
{
video = VideoContent::from_xml (this, node, version);
- audio = AudioContent::from_xml (this, node);
+ audio = AudioContent::from_xml (this, node, version);
subtitle = SubtitleContent::from_xml (this, node, version);
audio->set_stream (
_reference_video = node->optional_bool_child ("ReferenceVideo").get_value_or (false);
_reference_audio = node->optional_bool_child ("ReferenceAudio").get_value_or (false);
_reference_subtitle = node->optional_bool_child ("ReferenceSubtitle").get_value_or (false);
+ if (node->optional_string_child("Standard")) {
+ string const s = node->optional_string_child("Standard").get();
+ if (s == "Interop") {
+ _standard = dcp::INTEROP;
+ } else if (s == "SMPTE") {
+ _standard = dcp::SMPTE;
+ } else {
+ DCPOMATIC_ASSERT (false);
+ }
+ }
+ _three_d = node->optional_bool_child("ThreeD").get_value_or (false);
}
void
}
_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
node->add_child("ReferenceVideo")->add_child_text (_reference_video ? "1" : "0");
node->add_child("ReferenceAudio")->add_child_text (_reference_audio ? "1" : "0");
node->add_child("ReferenceSubtitle")->add_child_text (_reference_subtitle ? "1" : "0");
+ if (_standard) {
+ switch (_standard.get ()) {
+ case dcp::INTEROP:
+ node->add_child("Standard")->add_child_text ("Interop");
+ break;
+ case dcp::SMPTE:
+ node->add_child("Standard")->add_child_text ("SMPTE");
+ break;
+ default:
+ DCPOMATIC_ASSERT (false);
+ }
+ }
+ node->add_child("ThreeD")->add_child_text (_three_d ? "1" : "0");
}
DCPTime
string
DCPContent::identifier () const
{
- SafeStringStream s;
- s << Content::identifier() << "_" << video->identifier() << "_";
+ string s = Content::identifier() + "_" + video->identifier() + "_";
if (subtitle) {
- s << subtitle->identifier () << " ";
+ s += subtitle->identifier () + " ";
}
- s << (_reference_video ? "1" : "0")
- << (_reference_subtitle ? "1" : "0");
- return s.str ();
+
+ s += string (_reference_video ? "1" : "0") + string (_reference_subtitle ? "1" : "0");
+ return s;
}
void
void
DCPContent::add_properties (list<UserProperty>& p) const
{
+ Content::add_properties (p);
+ video->add_properties (p);
audio->add_properties (p);
}
list<DCPTimePeriod> p;
scoped_ptr<DCPDecoder> decoder;
try {
- decoder.reset (new DCPDecoder (shared_from_this(), film()->log(), false));
+ decoder.reset (new DCPDecoder (shared_from_this(), film()->log()));
} catch (...) {
/* Could not load the DCP; guess reels */
list<DCPTimePeriod> p;
bool
DCPContent::can_reference (function<shared_ptr<ContentPart> (shared_ptr<const Content>)> part, string overlapping, list<string>& why_not) const
{
+ /* We must be using the same standard as the film */
+ if (_standard) {
+ if (_standard.get() == dcp::INTEROP && !film()->interop()) {
+ why_not.push_back (_("The film is set to SMPTE and this DCP is Interop."));
+ return false;
+ } else if (_standard.get() == dcp::SMPTE && film()->interop()) {
+ why_not.push_back (_("The film is set to Interop and this DCP is SMPTE."));
+ return false;
+ }
+ }
+
list<DCPTimePeriod> const fr = film()->reels ();
/* fr must contain reels(). It can also contain other reels, but it must at
least contain reels().
*/
BOOST_FOREACH (DCPTimePeriod i, reels()) {
if (find (fr.begin(), fr.end(), i) == fr.end ()) {
- why_not.push_back (_("Reel lengths in the project differ from those in the DCP; set the reel mode to 'split by video content'."));
+ why_not.push_back (_("Reel lengths in the film differ from those in the DCP; set the reel mode to 'split by video content'."));
return false;
}
}
bool
DCPContent::can_reference_audio (list<string>& why_not) const
{
- DCPDecoder decoder (shared_from_this(), film()->log(), false);
+ DCPDecoder decoder (shared_from_this(), film()->log());
BOOST_FOREACH (shared_ptr<dcp::Reel> i, decoder.reels()) {
if (!i->main_sound()) {
why_not.push_back (_("The DCP does not have sound in all reels."));
bool
DCPContent::can_reference_subtitle (list<string>& why_not) const
{
- DCPDecoder decoder (shared_from_this(), film()->log(), false);
+ DCPDecoder decoder (shared_from_this(), film()->log());
BOOST_FOREACH (shared_ptr<dcp::Reel> i, decoder.reels()) {
if (!i->main_subtitle()) {
why_not.push_back (_("The DCP does not have subtitles in all reels."));
projects / dcpomatic.git / blobdiff