swaroop: take ownership of config file if we're run as root.

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

diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index 5371fbc11ca170a3649df461e063388f6c356475..3498cc96119940bbd2a25a4546c0c1fc0bc56662 100644 (file)
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -61,6 +61,7 @@ int const DCPContentProperty::REFERENCE_AUDIO    = 603;
 int const DCPContentProperty::REFERENCE_TEXT     = 604;
 int const DCPContentProperty::NAME               = 605;
 int const DCPContentProperty::TEXTS              = 606;
+int const DCPContentProperty::CPL                = 607;
 
 DCPContent::DCPContent (shared_ptr<const Film> film, boost::filesystem::path p)
        : Content (film)
@@ -143,7 +144,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());
                }
@@ -158,6 +159,12 @@ DCPContent::examine (shared_ptr<Job> job)
        string const old_name = name ();
        int const old_texts = text.size ();
 
+       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 ();
        }
@@ -175,6 +182,7 @@ DCPContent::examine (shared_ptr<Job> job)
        }
 
        if (examiner->has_audio()) {
+               ChangeSignaller<Content> cc (this, AudioContentProperty::STREAMS);
                {
                        boost::mutex::scoped_lock lm (_mutex);
                        audio.reset (new AudioContent (this));
@@ -184,7 +192,6 @@ DCPContent::examine (shared_ptr<Job> job)
                AudioMapping m = as->mapping ();
                film()->make_audio_mapping_default (m);
                as->set_mapping (m);
-               signal_changed (AudioContentProperty::STREAMS);
        }
 
        int texts = 0;
@@ -193,7 +200,7 @@ DCPContent::examine (shared_ptr<Job> job)
                _name = examiner->name ();
                for (int i = 0; i < TEXT_COUNT; ++i) {
                        if (examiner->has_text(static_cast<TextType>(i))) {
-                               text.push_back (shared_ptr<TextContent>(new TextContent(this, static_cast<TextType>(i))));
+                               text.push_back (shared_ptr<TextContent>(new TextContent(this, static_cast<TextType>(i), static_cast<TextType>(i))));
                        }
                }
                texts = text.size ();
@@ -206,24 +213,22 @@ DCPContent::examine (shared_ptr<Job> job)
                _reel_lengths = examiner->reel_lengths ();
        }
 
-       if (old_texts != texts) {
-               signal_changed (DCPContentProperty::TEXTS);
+       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);
        }
@@ -396,34 +401,34 @@ DCPContent::set_default_colour_conversion ()
 void
 DCPContent::set_reference_video (bool r)
 {
+       ChangeSignaller<Content> 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)
 {
+       ChangeSignaller<Content> cc (this, DCPContentProperty::REFERENCE_AUDIO);
+
        {
                boost::mutex::scoped_lock lm (_mutex);
                _reference_audio = r;
        }
-
-       signal_changed (DCPContentProperty::REFERENCE_AUDIO);
 }
 
 void
 DCPContent::set_reference_text (TextType type, bool r)
 {
+       ChangeSignaller<Content> cc (this, DCPContentProperty::REFERENCE_TEXT);
+
        {
                boost::mutex::scoped_lock lm (_mutex);
                _reference_text[type] = r;
        }
-
-       signal_changed (DCPContentProperty::REFERENCE_TEXT);
 }
 
 list<DCPTimePeriod>
@@ -595,6 +600,7 @@ bool check_text (shared_ptr<const Content> c)
 {
        return !c->text.empty();
 }
+
 bool
 DCPContent::can_reference_text (TextType type, string& why_not) const
 {
@@ -615,7 +621,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;
@@ -644,6 +650,21 @@ DCPContent::take_settings_from (shared_ptr<const Content> c)
 void
 DCPContent::set_cpl (string id)
 {
-       boost::mutex::scoped_lock lm (_mutex);
-       _cpl = id;
+       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();
 }