diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-12-03 10:12:35 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-12-03 10:12:35 +0000 |
| commit | c008066160d85b9ec9e5485375d7baaa5d27bda2 (patch) | |
| tree | cf2876d69549119bf22761c5f6eccb568242b647 /src/lib/content.cc | |
| parent | 996fa2194581bf95113b9778849654893c414889 (diff) | |
Hand-apply 6a3cd511559433554ab40ed72ff94b7d8dc2c5bd from master;
Basics of an image sequence dialog that asks about frame rate and
digest calculation.
Diffstat (limited to 'src/lib/content.cc')
| -rw-r--r-- | src/lib/content.cc | 9 |
1 files changed, 8 insertions, 1 deletions
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> 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 (); |
