X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.cc;h=cc29345a298f9b15d25444f439e3d2580dca8efa;hb=e159aafa457003982101cb6c03674d5e2ed2c0ab;hp=21e49a2c955ae7e74091ec5c1a43f4e9e238b857;hpb=5e4f001bf32e3cdf65efa34803d70e6c1c00c66b;p=dcpomatic.git

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 21e49a2c9..cc29345a2 100644
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -21,10 +21,6 @@
  *  @brief Content class.
  */
 
-#include <boost/thread/mutex.hpp>
-#include <libxml++/libxml++.h>
-#include <libcxml/cxml.h>
-#include <dcp/raw_convert.h>
 #include "content.h"
 #include "util.h"
 #include "content_factory.h"
@@ -32,11 +28,15 @@
 #include "exceptions.h"
 #include "film.h"
 #include "safe_stringstream.h"
+#include "job.h"
+#include <libcxml/cxml.h>
+#include <dcp/raw_convert.h>
+#include <libxml++/libxml++.h>
+#include <boost/thread/mutex.hpp>
 
 #include "i18n.h"
 
 using std::string;
-using std::set;
 using std::list;
 using std::cout;
 using std::vector;
@@ -88,7 +88,7 @@ Content::Content (shared_ptr<const Film> f, cxml::ConstNodePtr node)
 	for (list<cxml::NodePtr>::const_iterator i = path_children.begin(); i != path_children.end(); ++i) {
 		_paths.push_back ((*i)->content ());
 	}
-	_digest = node->string_child ("Digest");
+	_digest = node->optional_string_child ("Digest");
 	_position = DCPTime (node->number_child<double> ("Position"));
 	_trim_start = DCPTime (node->number_child<double> ("TrimStart"));
 	_trim_end = DCPTime (node->number_child<double> ("TrimEnd"));
@@ -124,15 +124,23 @@ Content::as_xml (xmlpp::Node* node) const
 	for (vector<boost::filesystem::path>::const_iterator i = _paths.begin(); i != _paths.end(); ++i) {
 		node->add_child("Path")->add_child_text (i->string ());
 	}
-	node->add_child("Digest")->add_child_text (_digest);
+	if (_digest) {
+		node->add_child("Digest")->add_child_text (_digest.get ());
+	}
 	node->add_child("Position")->add_child_text (raw_convert<string> (_position.get ()));
 	node->add_child("TrimStart")->add_child_text (raw_convert<string> (_trim_start.get ()));
 	node->add_child("TrimEnd")->add_child_text (raw_convert<string> (_trim_end.get ()));
 }
 
 void
-Content::examine (shared_ptr<Job> job)
+Content::examine (shared_ptr<Job> job, bool calculate_digest)
 {
+	if (!calculate_digest) {
+		return;
+	}
+
+	job->sub (_("Computing digest"));
+	
 	boost::mutex::scoped_lock lm (_mutex);
 	vector<boost::filesystem::path> p = _paths;
 	lm.unlock ();
@@ -210,7 +218,7 @@ Content::clone () const
 string
 Content::technical_summary () const
 {
-	return String::compose ("%1 %2 %3", path_summary(), digest(), position().seconds());
+	return String::compose ("%1 %2 %3", path_summary(), digest().get_value_or("X"), position().seconds());
 }
 
 DCPTime
@@ -227,7 +235,7 @@ Content::identifier () const
 {
 	SafeStringStream s;
 	
-	s << Content::digest()
+	s << Content::digest().get_value_or("X")
 	  << "_" << position().get()
 	  << "_" << trim_start().get()
 	  << "_" << trim_end().get();