X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fdcp_content.cc;h=a5c0e5da2e9b20cd70a8dbc0f6809cc3ae64aae1;hb=1a693725f9a8cc6ba58f65b2f1ef03255d295f23;hp=d866a6b86c69f03a9593d04b94d8ec1b2a5bca1c;hpb=ceeb74f2059005f604d00d955c68cb5be4ded284;p=dcpomatic.git

diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index d866a6b86..a5c0e5da2 100644
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -51,6 +51,7 @@ using boost::shared_ptr;
 using boost::scoped_ptr;
 using boost::optional;
 using boost::function;
+using boost::dynamic_pointer_cast;
 using dcp::raw_convert;
 
 int const DCPContentProperty::CAN_BE_PLAYED      = 600;
@@ -61,6 +62,7 @@ int const DCPContentProperty::REFERENCE_SUBTITLE = 603;
 DCPContent::DCPContent (shared_ptr<const Film> film, boost::filesystem::path p)
 	: Content (film)
 	, _encrypted (false)
+	, _needs_assets (false)
 	, _kdm_valid (false)
 	, _reference_video (false)
 	, _reference_audio (false)
@@ -95,8 +97,8 @@ DCPContent::DCPContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, in
 		);
 
 	_name = node->string_child ("Name");
-
 	_encrypted = node->bool_child ("Encrypted");
+	_needs_assets = node->bool_child ("NeedsAssets");
 	if (node->optional_node_child ("KDM")) {
 		_kdm = dcp::EncryptedKDM (node->string_child ("KDM"));
 	}
@@ -115,6 +117,7 @@ DCPContent::DCPContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, in
 		}
 	}
 	_three_d = node->optional_bool_child("ThreeD").get_value_or (false);
+	_cpl = node->optional_string_child("CPL");
 }
 
 void
@@ -160,9 +163,11 @@ DCPContent::examine (shared_ptr<Job> job)
 			subtitle.reset (new SubtitleContent (this));
 		}
 		_encrypted = examiner->encrypted ();
+		_needs_assets = examiner->needs_assets ();
 		_kdm_valid = examiner->kdm_valid ();
 		_standard = examiner->standard ();
 		_three_d = examiner->three_d ();
+		_cpl = examiner->cpl ();
 	}
 
 	if (could_be_played != can_be_played ()) {
@@ -188,11 +193,11 @@ DCPContent::technical_summary () const
 }
 
 void
-DCPContent::as_xml (xmlpp::Node* node) const
+DCPContent::as_xml (xmlpp::Node* node, bool with_paths) const
 {
 	node->add_child("Type")->add_child_text ("DCP");
 
-	Content::as_xml (node);
+	Content::as_xml (node, with_paths);
 
 	if (video) {
 		video->as_xml (node);
@@ -212,6 +217,7 @@ DCPContent::as_xml (xmlpp::Node* node) 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");
 	if (_kdm) {
 		node->add_child("KDM")->add_child_text (_kdm->as_xml ());
 	}
@@ -232,6 +238,9 @@ DCPContent::as_xml (xmlpp::Node* node) const
 		}
 	}
 	node->add_child("ThreeD")->add_child_text (_three_d ? "1" : "0");
+	if (_cpl) {
+		node->add_child("CPL")->add_child_text (_cpl.get ());
+	}
 }
 
 DCPTime
@@ -259,27 +268,36 @@ DCPContent::add_kdm (dcp::EncryptedKDM k)
 	_kdm = k;
 }
 
+void
+DCPContent::add_ov (boost::filesystem::path ov)
+{
+	read_directory (ov);
+}
+
 bool
 DCPContent::can_be_played () const
+{
+	return !needs_kdm() && !needs_assets();
+}
+
+bool
+DCPContent::needs_kdm () const
 {
 	boost::mutex::scoped_lock lm (_mutex);
-	return !_encrypted || _kdm_valid;
+	return _encrypted && !_kdm_valid;
 }
 
-boost::filesystem::path
-DCPContent::directory () const
+bool
+DCPContent::needs_assets () const
 {
-	optional<size_t> smallest;
-	boost::filesystem::path dir;
-	for (size_t i = 0; i < number_of_paths(); ++i) {
-		boost::filesystem::path const p = path (i).parent_path ();
-		size_t const d = distance (p.begin(), p.end());
-		if (!smallest || d < smallest.get ()) {
-			dir = p;
-		}
-	}
+	boost::mutex::scoped_lock lm (_mutex);
+	return _needs_assets;
+}
 
-	return dir;
+vector<boost::filesystem::path>
+DCPContent::directories () const
+{
+	return dcp::DCP::directories_from_files (paths ());
 }
 
 void
@@ -384,7 +402,7 @@ DCPContent::can_reference (function<shared_ptr<ContentPart> (shared_ptr<const Co
 	*/
 	BOOST_FOREACH (DCPTimePeriod i, reels()) {
 		if (find (fr.begin(), fr.end(), i) == fr.end ()) {
-			why_not.push_back (_("Reel lengths in the film differ from those in the DCP; set the reel mode to 'split by video content'."));
+			why_not.push_back (_("The reel lengths in the film differ from those in the DCP; set the reel mode to 'split by video content'."));
 			return false;
 		}
 	}
@@ -431,3 +449,14 @@ DCPContent::can_reference_subtitle (list<string>& why_not) const
 
         return can_reference (bind (&Content::subtitle, _1), _("There is other subtitle content overlapping this DCP; remove it."), why_not);
 }
+
+void
+DCPContent::use_template (shared_ptr<const Content> c)
+{
+	shared_ptr<const DCPContent> dc = dynamic_pointer_cast<const DCPContent> (c);
+	DCPOMATIC_ASSERT (dc);
+
+	_reference_video = dc->_reference_video;
+	_reference_audio = dc->_reference_audio;
+	_reference_subtitle = dc->_reference_subtitle;
+}