X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_content.cc;h=d1a65800155ec13559b071ee41f3332a782af08a;hb=59e769023c392c332331567a1aea94660002c463;hp=0eef075d7c0b9eddcb58c7dfd544af212e90b21c;hpb=d2137ac5db409e686b4d9b3fa567935a5e416d41;p=dcpomatic.git

diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index 0eef075d7..d1a658001 100644
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -17,17 +17,23 @@
 
 */
 
-#include <dcp/dcp.h>
 #include "dcp_content.h"
 #include "dcp_examiner.h"
 #include "job.h"
 #include "film.h"
+#include "config.h"
 #include "compose.hpp"
+#include <dcp/dcp.h>
+#include <dcp/exceptions.h>
 
 #include "i18n.h"
 
 using std::string;
+using std::cout;
 using boost::shared_ptr;
+using boost::optional;
+
+int const DCPContentProperty::CAN_BE_PLAYED = 600;
 
 DCPContent::DCPContent (shared_ptr<const Film> f, boost::filesystem::path p)
 	: Content (f)
@@ -35,7 +41,9 @@ DCPContent::DCPContent (shared_ptr<const Film> f, boost::filesystem::path p)
 	, SingleStreamAudioContent (f)
 	, SubtitleContent (f)
 	, _has_subtitles (false)
+	, _encrypted (false)
 	, _directory (p)
+	, _kdm_valid (false)
 {
 	read_directory (p);
 }
@@ -49,6 +57,11 @@ DCPContent::DCPContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int v
 	_name = node->string_child ("Name");
 	_has_subtitles = node->bool_child ("HasSubtitles");
 	_directory = node->string_child ("Directory");
+	_encrypted = node->bool_child ("Encrypted");
+	if (node->optional_node_child ("KDM")) {
+		_kdm = dcp::EncryptedKDM (node->string_child ("KDM"));
+	}
+	_kdm_valid = node->bool_child ("KDMValid");
 }
 
 void
@@ -66,6 +79,8 @@ DCPContent::read_directory (boost::filesystem::path p)
 void
 DCPContent::examine (shared_ptr<Job> job)
 {
+	bool const could_be_played = can_be_played ();
+		
 	job->set_progress_unknown ();
 	Content::examine (job);
 	
@@ -76,6 +91,12 @@ DCPContent::examine (shared_ptr<Job> job)
 	boost::mutex::scoped_lock lm (_mutex);
 	_name = examiner->name ();
 	_has_subtitles = examiner->has_subtitles ();
+	_encrypted = examiner->encrypted ();
+	_kdm_valid = examiner->kdm_valid ();
+
+	if (could_be_played != can_be_played ()) {
+		signal_changed (DCPContentProperty::CAN_BE_PLAYED);
+	}
 }
 
 string
@@ -106,14 +127,19 @@ DCPContent::as_xml (xmlpp::Node* node) const
 	boost::mutex::scoped_lock lm (_mutex);
 	node->add_child("Name")->add_child_text (_name);
 	node->add_child("HasSubtitles")->add_child_text (_has_subtitles ? "1" : "0");
+	node->add_child("Encrypted")->add_child_text (_encrypted ? "1" : "0");
 	node->add_child("Directory")->add_child_text (_directory.string ());
+	if (_kdm) {
+		node->add_child("KDM")->add_child_text (_kdm->as_xml ());
+	}
+	node->add_child("KDMValid")->add_child_text (_kdm_valid ? "1" : "0");
 }
 
 DCPTime
 DCPContent::full_length () const
 {
 	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
+	DCPOMATIC_ASSERT (film);
 	return DCPTime (video_length (), FrameRateChange (video_frame_rate (), film->video_frame_rate ()));
 }
 
@@ -123,9 +149,14 @@ DCPContent::identifier () const
 	return SubtitleContent::identifier ();
 }
 
+void
+DCPContent::add_kdm (dcp::EncryptedKDM k)
+{
+	_kdm = k;
+}
+
 bool
-DCPContent::has_subtitles () const
+DCPContent::can_be_played () const
 {
-	boost::mutex::scoped_lock lm (_mutex);
-	return _has_subtitles;
+	return !_encrypted || _kdm_valid;
 }