X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.cc;h=6e02183233da9f6f288794d61de2835bc439c8d1;hb=c008066160d85b9ec9e5485375d7baaa5d27bda2;hp=bbbe9b6ce4bdd4dd5ff6b8dcf231c8d08126e253;hpb=d2137ac5db409e686b4d9b3fa567935a5e416d41;p=dcpomatic.git

diff --git a/src/lib/content.cc b/src/lib/content.cc
index bbbe9b6ce..6e0218323 100644
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -31,11 +31,12 @@
 #include "ui_signaller.h"
 #include "exceptions.h"
 #include "film.h"
+#include "safe_stringstream.h"
+#include "job.h"
 
 #include "i18n.h"
 
 using std::string;
-using std::stringstream;
 using std::set;
 using std::list;
 using std::cout;
@@ -131,8 +132,14 @@ Content::as_xml (xmlpp::Node* node) const
 }
 
 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 ();
@@ -225,7 +232,7 @@ Content::length_after_trim () const
 string
 Content::identifier () const
 {
-	stringstream s;
+	SafeStringStream s;
 	
 	s << Content::digest()
 	  << "_" << position().get()