Do content digest in the examine contents job (fixes #6).

diff --git a/src/lib/examine_content_job.cc b/src/lib/examine_content_job.cc
index 70a04b8255059262ec0de2fc8e0c929a277b6702..a783cde339f646a009d7b4c3da9eea617ace0b16 100644 (file)
--- 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 4cfe7de0abce543e9b7c71e9743c422bf8542338..a1c9eb7f0e73ca975c6c6801838e62f7c9c49433 100644 (file)
--- 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 (...) {