X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_content.cc;h=a527b1f809605a8435ebcece3738aebb01ec8983;hb=1fe6bd7f8ba059322b8357b2210f0fd590567ce2;hp=d4891ad457849a4db38b2a94a7540abe23b9ce03;hpb=d7ac100c0eb1b5efdcfbec59be870fd869252840;p=dcpomatic.git diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index d4891ad45..a527b1f80 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -58,9 +58,10 @@ int const DCPContentProperty::NEEDS_ASSETS = 600; int const DCPContentProperty::NEEDS_KDM = 601; int const DCPContentProperty::REFERENCE_VIDEO = 602; int const DCPContentProperty::REFERENCE_AUDIO = 603; -int const DCPContentProperty::REFERENCE_SUBTITLE = 604; +int const DCPContentProperty::REFERENCE_TEXT = 604; int const DCPContentProperty::NAME = 605; -int const DCPContentProperty::HAS_SUBTITLES = 606; +int const DCPContentProperty::TEXTS = 606; +int const DCPContentProperty::CPL = 607; DCPContent::DCPContent (shared_ptr film, boost::filesystem::path p) : Content (film) @@ -69,11 +70,14 @@ DCPContent::DCPContent (shared_ptr film, boost::filesystem::path p) , _kdm_valid (false) , _reference_video (false) , _reference_audio (false) - , _reference_subtitle (false) , _three_d (false) { read_directory (p); set_default_colour_conversion (); + + for (int i = 0; i < TEXT_COUNT; ++i) { + _reference_text[i] = false; + } } DCPContent::DCPContent (shared_ptr film, cxml::ConstNodePtr node, int version) @@ -81,7 +85,11 @@ DCPContent::DCPContent (shared_ptr film, cxml::ConstNodePtr node, in { video = VideoContent::from_xml (this, node, version); audio = AudioContent::from_xml (this, node, version); - subtitle = TextContent::from_xml (this, node, version); + text = TextContent::from_xml (this, node, version); + + for (int i = 0; i < TEXT_COUNT; ++i) { + _reference_text[i] = false; + } if (video && audio) { audio->set_stream ( @@ -107,7 +115,13 @@ DCPContent::DCPContent (shared_ptr film, cxml::ConstNodePtr node, in _kdm_valid = node->bool_child ("KDMValid"); _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 (version >= 37) { + _reference_text[TEXT_OPEN_SUBTITLE] = node->optional_bool_child("ReferenceOpenSubtitle").get_value_or(false); + _reference_text[TEXT_CLOSED_CAPTION] = node->optional_bool_child("ReferenceClosedCaption").get_value_or(false); + } else { + _reference_text[TEXT_OPEN_SUBTITLE] = node->optional_bool_child("ReferenceSubtitle").get_value_or(false); + _reference_text[TEXT_CLOSED_CAPTION] = false; + } if (node->optional_string_child("Standard")) { string const s = node->optional_string_child("Standard").get(); if (s == "Interop") { @@ -143,7 +157,13 @@ DCPContent::examine (shared_ptr job) bool const needed_assets = needs_assets (); bool const needed_kdm = needs_kdm (); string const old_name = name (); - bool had_subtitles = static_cast (subtitle); + int const old_texts = text.size (); + + ContentChange cc_texts (this, DCPContentProperty::TEXTS); + ContentChange cc_assets (this, DCPContentProperty::NEEDS_ASSETS); + ContentChange cc_kdm (this, DCPContentProperty::NEEDS_KDM); + ContentChange cc_name (this, DCPContentProperty::NAME); + ContentChange cc_streams (this, AudioContentProperty::STREAMS); if (job) { job->set_progress_unknown (); @@ -162,6 +182,7 @@ DCPContent::examine (shared_ptr job) } if (examiner->has_audio()) { + ContentChange cc (this, AudioContentProperty::STREAMS); { boost::mutex::scoped_lock lm (_mutex); audio.reset (new AudioContent (this)); @@ -171,19 +192,18 @@ DCPContent::examine (shared_ptr job) AudioMapping m = as->mapping (); film()->make_audio_mapping_default (m); as->set_mapping (m); - signal_changed (AudioContentProperty::STREAMS); } - bool has_subtitles = false; + int texts = 0; { boost::mutex::scoped_lock lm (_mutex); _name = examiner->name (); - if (examiner->has_subtitles ()) { - subtitle.reset (new TextContent (this)); - } else { - subtitle.reset (); + for (int i = 0; i < TEXT_COUNT; ++i) { + if (examiner->has_text(static_cast(i))) { + text.push_back (shared_ptr(new TextContent(this, static_cast(i), static_cast(i)))); + } } - has_subtitles = static_cast (subtitle); + texts = text.size (); _encrypted = examiner->encrypted (); _needs_assets = examiner->needs_assets (); _kdm_valid = examiner->kdm_valid (); @@ -193,24 +213,22 @@ DCPContent::examine (shared_ptr job) _reel_lengths = examiner->reel_lengths (); } - if (had_subtitles != has_subtitles) { - signal_changed (DCPContentProperty::HAS_SUBTITLES); + if (old_texts == texts) { + cc_texts.abort (); } - if (needed_assets != needs_assets ()) { - signal_changed (DCPContentProperty::NEEDS_ASSETS); + if (needed_assets == needs_assets()) { + cc_assets.abort (); } - if (needed_kdm != needs_kdm ()) { - signal_changed (DCPContentProperty::NEEDS_KDM); + if (needed_kdm == needs_kdm()) { + cc_kdm.abort (); } - if (old_name != name ()) { - signal_changed (DCPContentProperty::NAME); + if (old_name == name()) { + cc_name.abort (); } - signal_changed (AudioContentProperty::STREAMS); - if (video) { video->set_frame_type (_three_d ? VIDEO_FRAME_TYPE_3D : VIDEO_FRAME_TYPE_2D); } @@ -254,8 +272,8 @@ DCPContent::as_xml (xmlpp::Node* node, bool with_paths) const audio->stream()->mapping().as_xml (node->add_child("AudioMapping")); } - if (subtitle) { - subtitle->as_xml (node); + BOOST_FOREACH (shared_ptr i, text) { + i->as_xml (node); } boost::mutex::scoped_lock lm (_mutex); @@ -268,7 +286,8 @@ DCPContent::as_xml (xmlpp::Node* node, bool with_paths) const node->add_child("KDMValid")->add_child_text (_kdm_valid ? "1" : "0"); 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"); + node->add_child("ReferenceOpenSubtitle")->add_child_text(_reference_text[TEXT_OPEN_SUBTITLE] ? "1" : "0"); + node->add_child("ReferenceClosedCaption")->add_child_text(_reference_text[TEXT_CLOSED_CAPTION] ? "1" : "0"); if (_standard) { switch (_standard.get ()) { case dcp::INTEROP: @@ -309,11 +328,14 @@ DCPContent::identifier () const s += video->identifier() + "_"; } - if (subtitle) { - s += subtitle->identifier () + " "; + BOOST_FOREACH (shared_ptr i, text) { + s += i->identifier () + " "; } - s += string (_reference_video ? "1" : "0") + string (_reference_subtitle ? "1" : "0"); + s += string (_reference_video ? "1" : "0"); + for (int i = 0; i < TEXT_COUNT; ++i) { + s += string (_reference_text[i] ? "1" : "0"); + } return s; } @@ -379,34 +401,34 @@ DCPContent::set_default_colour_conversion () void DCPContent::set_reference_video (bool r) { + ContentChange cc (this, DCPContentProperty::REFERENCE_VIDEO); + { boost::mutex::scoped_lock lm (_mutex); _reference_video = r; } - - signal_changed (DCPContentProperty::REFERENCE_VIDEO); } void DCPContent::set_reference_audio (bool r) { + ContentChange cc (this, DCPContentProperty::REFERENCE_AUDIO); + { boost::mutex::scoped_lock lm (_mutex); _reference_audio = r; } - - signal_changed (DCPContentProperty::REFERENCE_AUDIO); } void -DCPContent::set_reference_subtitle (bool r) +DCPContent::set_reference_text (TextType type, bool r) { + ContentChange cc (this, DCPContentProperty::REFERENCE_TEXT); + { boost::mutex::scoped_lock lm (_mutex); - _reference_subtitle = r; + _reference_text[type] = r; } - - signal_changed (DCPContentProperty::REFERENCE_SUBTITLE); } list @@ -459,7 +481,7 @@ DCPContent::reel_split_points () const } bool -DCPContent::can_reference (function (shared_ptr)> part, string overlapping, string& why_not) const +DCPContent::can_reference (function)> part, string overlapping, string& why_not) const { /* We must be using the same standard as the film */ if (_standard) { @@ -514,6 +536,12 @@ DCPContent::can_reference (function (shared_ptr c) +{ + return static_cast(c->video); +} + bool DCPContent::can_reference_video (string& why_not) const { @@ -529,7 +557,13 @@ DCPContent::can_reference_video (string& why_not) const } /// TRANSLATORS: this string will follow "Cannot reference this DCP: " - return can_reference (bind (&Content::video, _1), _("it overlaps other video content; remove the other content."), why_not); + return can_reference (bind (&check_video, _1), _("it overlaps other video content; remove the other content."), why_not); +} + +static +bool check_audio (shared_ptr c) +{ + return static_cast(c->audio); } bool @@ -558,11 +592,16 @@ DCPContent::can_reference_audio (string& why_not) const } /// TRANSLATORS: this string will follow "Cannot reference this DCP: " - return can_reference (bind (&Content::audio, _1), _("it overlaps other audio content; remove the other content."), why_not); + return can_reference (bind (&check_audio, _1), _("it overlaps other audio content; remove the other content."), why_not); } +static +bool check_text (shared_ptr c) +{ + return !c->text.empty(); +} bool -DCPContent::can_reference_subtitle (string& why_not) const +DCPContent::can_reference_text (TextType type, string& why_not) const { shared_ptr decoder; try { @@ -576,15 +615,20 @@ DCPContent::can_reference_subtitle (string& why_not) const } BOOST_FOREACH (shared_ptr i, decoder->reels()) { - if (!i->main_subtitle()) { + if (type == TEXT_OPEN_SUBTITLE && !i->main_subtitle()) { /// TRANSLATORS: this string will follow "Cannot reference this DCP: " - why_not = _("it does not have subtitles in all its reels."); + why_not = _("it does not have open subtitles in all its reels."); return false; } + if (type == TEXT_CLOSED_CAPTION && !i->closed_caption()) { + /// TRANSLATORS: this string will follow "Cannot reference this DCP: " + why_not = _("it does not have closed captions in all its reels."); + return false; + } } /// TRANSLATORS: this string will follow "Cannot reference this DCP: " - return can_reference (bind (&Content::subtitle, _1), _("it overlaps other subtitle content; remove the other content."), why_not); + return can_reference (bind (&check_text, _1), _("it overlaps other text content; remove the other content."), why_not); } void @@ -597,12 +641,18 @@ DCPContent::take_settings_from (shared_ptr c) _reference_video = dc->_reference_video; _reference_audio = dc->_reference_audio; - _reference_subtitle = dc->_reference_subtitle; + for (int i = 0; i < TEXT_COUNT; ++i) { + _reference_text[i] = dc->_reference_text[i]; + } } void DCPContent::set_cpl (string id) { - boost::mutex::scoped_lock lm (_mutex); - _cpl = id; + ContentChange cc (this, DCPContentProperty::CPL); + + { + boost::mutex::scoped_lock lm (_mutex); + _cpl = id; + } }