diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-12-16 14:55:59 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-12-16 14:55:59 +0000 |
| commit | 1fe3f08c50ba230c2eb2506d51287878679bdcb7 (patch) | |
| tree | aee4f039a26dd3bf1c61e151ffdcc784dc053e4c /src/lib | |
| parent | aa230169f8b59b7cb2da9a3bbb8ce5f7600285c0 (diff) | |
Do content digest in the examine contents job (fixes #6).
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/examine_content_job.cc | 6 | ||||
| -rw-r--r-- | src/lib/film.cc | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/examine_content_job.cc b/src/lib/examine_content_job.cc index 70a04b825..a783cde33 100644 --- a/src/lib/examine_content_job.cc +++ b/src/lib/examine_content_job.cc @@ -59,7 +59,11 @@ ExamineContentJob::name () const void ExamineContentJob::run () { - descend (1); + descend (0.5); + _film->set_content_digest (md5_digest (_film->content_path ())); + ascend (); + + descend (0.5); /* Set the film's length to either a) a length judged by running through the content or diff --git a/src/lib/film.cc b/src/lib/film.cc index 4cfe7de0a..a1c9eb7f0 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -875,8 +875,6 @@ Film::set_content (string c) signal_changed (CONTENT); - set_content_digest (md5_digest (content_path ())); - examine_content (); } catch (...) { |