Fix non-variant build.

[dcpomatic.git] / src / lib / dcp_content.cc

diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index a527b1f809605a8435ebcece3738aebb01ec8983..7301e537393e43eb1097cb806f6506b87727754c 100644 (file)
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -133,6 +133,11 @@ DCPContent::DCPContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, in
                }
        }
        _three_d = node->optional_bool_child("ThreeD").get_value_or (false);
+
+       optional<string> ck = node->optional_string_child("ContentKind");
+       if (ck) {
+               _content_kind = dcp::content_kind_from_string (*ck);
+       }
        _cpl = node->optional_string_child("CPL");
        BOOST_FOREACH (cxml::ConstNodePtr i, node->node_children("ReelLength")) {
                _reel_lengths.push_back (raw_convert<int64_t> (i->content ()));
@@ -144,7 +149,7 @@ DCPContent::read_directory (boost::filesystem::path p)
 {
        for (boost::filesystem::directory_iterator i(p); i != boost::filesystem::directory_iterator(); ++i) {
                if (boost::filesystem::is_regular_file (i->path())) {
-                       _paths.push_back (i->path());
+                       add_path (i->path());
                } else if (boost::filesystem::is_directory (i->path ())) {
                        read_directory (i->path());
                }
@@ -159,11 +164,11 @@ DCPContent::examine (shared_ptr<Job> job)
        string const old_name = name ();
        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);
+       ChangeSignaller<Content> cc_texts (this, DCPContentProperty::TEXTS);
+       ChangeSignaller<Content> cc_assets (this, DCPContentProperty::NEEDS_ASSETS);
+       ChangeSignaller<Content> cc_kdm (this, DCPContentProperty::NEEDS_KDM);
+       ChangeSignaller<Content> cc_name (this, DCPContentProperty::NAME);
+       ChangeSignaller<Content> cc_streams (this, AudioContentProperty::STREAMS);
 
        if (job) {
                job->set_progress_unknown ();
@@ -182,7 +187,7 @@ DCPContent::examine (shared_ptr<Job> job)
        }
 
        if (examiner->has_audio()) {
-               ContentChange cc (this, AudioContentProperty::STREAMS);
+               ChangeSignaller<Content> cc (this, AudioContentProperty::STREAMS);
                {
                        boost::mutex::scoped_lock lm (_mutex);
                        audio.reset (new AudioContent (this));
@@ -209,6 +214,7 @@ DCPContent::examine (shared_ptr<Job> job)
                _kdm_valid = examiner->kdm_valid ();
                _standard = examiner->standard ();
                _three_d = examiner->three_d ();
+               _content_kind = examiner->content_kind ();
                _cpl = examiner->cpl ();
                _reel_lengths = examiner->reel_lengths ();
        }
@@ -301,6 +307,9 @@ DCPContent::as_xml (xmlpp::Node* node, bool with_paths) const
                }
        }
        node->add_child("ThreeD")->add_child_text (_three_d ? "1" : "0");
+       if (_content_kind) {
+               node->add_child("ContentKind")->add_child_text(dcp::content_kind_to_string(*_content_kind));
+       }
        if (_cpl) {
                node->add_child("CPL")->add_child_text (_cpl.get ());
        }
@@ -401,7 +410,7 @@ DCPContent::set_default_colour_conversion ()
 void
 DCPContent::set_reference_video (bool r)
 {
-       ContentChange cc (this, DCPContentProperty::REFERENCE_VIDEO);
+       ChangeSignaller<Content> cc (this, DCPContentProperty::REFERENCE_VIDEO);
 
        {
                boost::mutex::scoped_lock lm (_mutex);
@@ -412,7 +421,7 @@ DCPContent::set_reference_video (bool r)
 void
 DCPContent::set_reference_audio (bool r)
 {
-       ContentChange cc (this, DCPContentProperty::REFERENCE_AUDIO);
+       ChangeSignaller<Content> cc (this, DCPContentProperty::REFERENCE_AUDIO);
 
        {
                boost::mutex::scoped_lock lm (_mutex);
@@ -423,7 +432,7 @@ DCPContent::set_reference_audio (bool r)
 void
 DCPContent::set_reference_text (TextType type, bool r)
 {
-       ContentChange cc (this, DCPContentProperty::REFERENCE_TEXT);
+       ChangeSignaller<Content> cc (this, DCPContentProperty::REFERENCE_TEXT);
 
        {
                boost::mutex::scoped_lock lm (_mutex);
@@ -600,6 +609,7 @@ bool check_text (shared_ptr<const Content> c)
 {
        return !c->text.empty();
 }
+
 bool
 DCPContent::can_reference_text (TextType type, string& why_not) const
 {
@@ -620,7 +630,7 @@ DCPContent::can_reference_text (TextType type, string& why_not) const
                         why_not = _("it does not have open subtitles in all its reels.");
                         return false;
                 }
-               if (type == TEXT_CLOSED_CAPTION && !i->closed_caption()) {
+               if (type == TEXT_CLOSED_CAPTION && i->closed_captions().empty()) {
                        /// TRANSLATORS: this string will follow "Cannot reference this DCP: "
                         why_not = _("it does not have closed captions in all its reels.");
                         return false;
@@ -649,10 +659,21 @@ DCPContent::take_settings_from (shared_ptr<const Content> c)
 void
 DCPContent::set_cpl (string id)
 {
-       ContentChange cc (this, DCPContentProperty::CPL);
+       ChangeSignaller<Content> cc (this, DCPContentProperty::CPL);
 
        {
                boost::mutex::scoped_lock lm (_mutex);
                _cpl = id;
        }
 }
+
+bool
+DCPContent::kdm_timing_window_valid () const
+{
+       if (!_kdm) {
+               return true;
+       }
+
+       dcp::LocalTime now;
+       return _kdm->not_valid_before() < now && now < _kdm->not_valid_after();
+}