Supporters update.

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

diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index 249eb47b5d2b518388bb4d9e6d80cbbb98761ac4..bdd5e0e091c0aa6b523ec7c7400ec9449beef3a0 100644 (file)
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -31,7 +31,6 @@
 #include "job.h"
 #include "log.h"
 #include "overlaps.h"
-#include "scope_guard.h"
 #include "text_content.h"
 #include "video_content.h"
 #include <dcp/dcp.h>
@@ -41,6 +40,7 @@
 #include <dcp/reel_picture_asset.h>
 #include <dcp/reel_subtitle_asset.h>
 #include <dcp/reel.h>
+#include <dcp/scope_guard.h>
 #include <libxml++/libxml++.h>
 #include <iterator>
 #include <iostream>
@@ -224,7 +224,7 @@ DCPContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
        string const old_name = name ();
 
        ContentChangeSignalDespatcher::instance()->suspend();
-       ScopeGuard sg = []() {
+       dcp::ScopeGuard sg = []() {
                ContentChangeSignalDespatcher::instance()->resume();
        };
 
@@ -374,6 +374,7 @@ DCPContent::as_xml (xmlpp::Node* node, bool with_paths) const
        }
 
        boost::mutex::scoped_lock lm (_mutex);
+
        node->add_child("Name")->add_child_text (_name);
        node->add_child("Encrypted")->add_child_text (_encrypted ? "1" : "0");
        node->add_child("NeedsAssets")->add_child_text (_needs_assets ? "1" : "0");
@@ -460,6 +461,8 @@ DCPContent::identifier () const
                s += i->identifier () + " ";
        }
 
+       boost::mutex::scoped_lock lm(_mutex);
+
        s += string (_reference_video ? "1" : "0");
        for (auto text: _reference_text) {
                s += string(text ? "1" : "0");
@@ -717,13 +720,13 @@ DCPContent::can_reference_audio (shared_ptr<const Film> film, string& why_not) c
                return false;
        }
 
-        for (auto i: decoder->reels()) {
-                if (!i->main_sound()) {
-                       /// TRANSLATORS: this string will follow "Cannot reference this DCP: "
-                        why_not = _("it does not have sound in all its reels.");
-                        return false;
-                }
-        }
+       if (audio && audio->stream()) {
+               auto const channels = audio->stream()->channels();
+               if (channels != film->audio_channels()) {
+                       why_not = String::compose(_("it has a different number of audio channels than the project; set the project to have %1 channels."), channels);
+                       return false;
+               }
+       }
 
        /// TRANSLATORS: this string will follow "Cannot reference this DCP: "
        return can_reference(
@@ -745,6 +748,9 @@ DCPContent::can_reference_text (shared_ptr<const Film> film, TextType type, stri
        } catch (dcp::ReadError &) {
                /* We couldn't read the DCP, so it's probably missing */
                return false;
+       } catch (DCPError &) {
+               /* We couldn't read the DCP, so it's probably missing */
+               return false;
        } catch (dcp::KDMDecryptionError &) {
                /* We have an incorrect KDM */
                return false;
@@ -752,22 +758,13 @@ DCPContent::can_reference_text (shared_ptr<const Film> film, TextType type, stri
 
         for (auto i: decoder->reels()) {
                 if (type == TextType::OPEN_SUBTITLE) {
-                       if (!i->main_subtitle()) {
-                               /// TRANSLATORS: this string will follow "Cannot reference this DCP: "
-                               why_not = _("it does not have open subtitles in all its reels.");
-                               return false;
-                       } else if (i->main_subtitle()->entry_point().get_value_or(0) != 0) {
+                       if (i->main_subtitle() && i->main_subtitle()->entry_point().get_value_or(0) != 0) {
                                /// TRANSLATORS: this string will follow "Cannot reference this DCP: "
                                why_not = _("one of its subtitle reels has a non-zero entry point so it must be re-written.");
                                return false;
                        }
                 }
                if (type == TextType::CLOSED_CAPTION) {
-                       if (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;
-                       }
                        for (auto j: i->closed_captions()) {
                                if (j->entry_point().get_value_or(0) != 0) {
                                        /// TRANSLATORS: this string will follow "Cannot reference this DCP: "
@@ -803,6 +800,13 @@ DCPContent::take_settings_from (shared_ptr<const Content> c)
                return;
        }
 
+       if (this == dc.get()) {
+               return;
+       }
+
+       boost::mutex::scoped_lock lm(_mutex);
+       boost::mutex::scoped_lock lm2(dc->_mutex);
+
        _reference_video = dc->_reference_video;
        _reference_audio = dc->_reference_audio;
        _reference_text = dc->_reference_text;
@@ -834,7 +838,7 @@ DCPContent::kdm_timing_window_valid () const
 Resolution
 DCPContent::resolution () const
 {
-       if (video->size().width > 2048 || video->size().height > 1080) {
+       if (video->size() && (video->size()->width > 2048 || video->size()->height > 1080)) {
                return Resolution::FOUR_K;
        }