Factor out key-value code.

[dcpomatic.git] / src / lib / check_hashes_job.cc

diff --git a/src/lib/check_hashes_job.cc b/src/lib/check_hashes_job.cc
index cf269564aa7f2dc81717907249e087fef2c5d835..f07a5ab2accaf9d98172bbb2ba9da7cd213b0516 100644 (file)
--- a/src/lib/check_hashes_job.cc
+++ b/src/lib/check_hashes_job.cc
@@ -31,8 +31,8 @@
 using namespace std;
 using namespace boost;
 
-CheckHashesJob::CheckHashesJob (shared_ptr<const FilmState> s, shared_ptr<const Options> o, Log* l)
-       : Job (s, o, l)
+CheckHashesJob::CheckHashesJob (shared_ptr<const FilmState> s, shared_ptr<const Options> o, Log* l, shared_ptr<Job> req)
+       : Job (s, o, l, req)
        , _bad (0)
 {
 
@@ -48,8 +48,10 @@ void
 CheckHashesJob::run ()
 {
        _bad = 0;
+
+       int const N = _fs->dcp_length ();
        
-       for (int i = 0; i < _fs->length; ++i) {
+       for (int i = 0; i < N; ++i) {
                string const j2k_file = _opt->frame_out_path (i, false);
                string const hash_file = j2k_file + ".md5";
 
@@ -71,13 +73,13 @@ CheckHashesJob::run ()
                shared_ptr<Job> tc;
 
                if (_fs->dcp_ab) {
-                       tc.reset (new ABTranscodeJob (_fs, _opt, _log));
+                       tc.reset (new ABTranscodeJob (_fs, _opt, _log, shared_from_this()));
                } else {
-                       tc.reset (new TranscodeJob (_fs, _opt, _log));
+                       tc.reset (new TranscodeJob (_fs, _opt, _log, shared_from_this()));
                }
                
                JobManager::instance()->add_after (shared_from_this(), tc);
-               JobManager::instance()->add_after (tc, shared_ptr<Job> (new CheckHashesJob (_fs, _opt, _log)));
+               JobManager::instance()->add_after (tc, shared_ptr<Job> (new CheckHashesJob (_fs, _opt, _log, tc)));
        }
                
        set_progress (1);