From c008066160d85b9ec9e5485375d7baaa5d27bda2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 3 Dec 2014 10:12:35 +0000 Subject: Hand-apply 6a3cd511559433554ab40ed72ff94b7d8dc2c5bd from master; Basics of an image sequence dialog that asks about frame rate and digest calculation. --- src/lib/content.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/lib/content.cc') diff --git a/src/lib/content.cc b/src/lib/content.cc index 21e49a2c9..6e0218323 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -32,6 +32,7 @@ #include "exceptions.h" #include "film.h" #include "safe_stringstream.h" +#include "job.h" #include "i18n.h" @@ -131,8 +132,14 @@ Content::as_xml (xmlpp::Node* node) const } void -Content::examine (shared_ptr job) +Content::examine (shared_ptr job, bool calculate_digest) { + if (!calculate_digest) { + return; + } + + job->sub (_("Computing digest")); + boost::mutex::scoped_lock lm (_mutex); vector p = _paths; lm.unlock (); -- cgit v1.2.3