X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.cc;h=b00ea3e5774ec02d89e2f77778892861af818bb9;hb=05c37bfdb86be26497d5baa448a0cbda20e33bed;hp=21e49a2c955ae7e74091ec5c1a43f4e9e238b857;hpb=6de35d058821acc092d2aae75543024a97026b8a;p=dcpomatic.git

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 21e49a2c9..b00ea3e57 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,17 +28,20 @@
 #include "exceptions.h"
 #include "film.h"
 #include "safe_stringstream.h"
+#include "job.h"
+#include "raw_convert.h"
+#include <libcxml/cxml.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;
 using std::max;
 using boost::shared_ptr;
-using dcp::raw_convert;
 
 int const ContentProperty::PATH = 400;
 int const ContentProperty::POSITION = 401;
@@ -88,7 +87,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").get_value_or ("X");
 	_position = DCPTime (node->number_child<double> ("Position"));
 	_trim_start = DCPTime (node->number_child<double> ("TrimStart"));
 	_trim_end = DCPTime (node->number_child<double> ("TrimEnd"));
@@ -133,11 +132,19 @@ Content::as_xml (xmlpp::Node* node) const
 void
 Content::examine (shared_ptr<Job> job)
 {
+	if (job) {
+		job->sub (_("Computing digest"));
+	}
+	
 	boost::mutex::scoped_lock lm (_mutex);
 	vector<boost::filesystem::path> p = _paths;
 	lm.unlock ();
-	
-	string const d = md5_digest (p, job);
+
+	/* Some content files are very big, so we use a poor's
+	   digest here: a MD5 of the first and last 1e6 bytes with the
+	   size of the first file tacked on the end as a string.
+	*/
+	string const d = md5_digest_head_tail (p, 1000000) + raw_convert<string> (boost::filesystem::file_size (p.front ()));
 
 	lm.lock ();
 	_digest = d;
@@ -146,9 +153,7 @@ Content::examine (shared_ptr<Job> job)
 void
 Content::signal_changed (int p)
 {
-	if (ui_signaller) {
-		ui_signaller->emit (boost::bind (boost::ref (Changed), shared_from_this (), p, _change_signals_frequent));
-	}
+	emit (boost::bind (boost::ref (Changed), shared_from_this (), p, _change_signals_frequent));
 }
 
 void
@@ -260,7 +265,7 @@ Content::path_summary () const
 {
 	/* XXX: should handle multiple paths more gracefully */
 
-	assert (number_of_paths ());
+	DCPOMATIC_ASSERT (number_of_paths ());
 
 	string s = path(0).filename().string ();
 	if (number_of_paths() > 1) {