X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcheck_hashes_job.cc;h=701584c74dfb7ca7c2f0f4b32f2623d0e57c50cb;hb=d641aee73077e93ca17b30acd5b9ed82f1e14cb9;hp=3967d0d704e4c46b8e43db6f6fbd3022a98f5db8;hpb=4fb0a5ab9eebc0f07981edc3a6813102520b8233;p=dcpomatic.git

diff --git a/src/lib/check_hashes_job.cc b/src/lib/check_hashes_job.cc
index 3967d0d70..701584c74 100644
--- a/src/lib/check_hashes_job.cc
+++ b/src/lib/check_hashes_job.cc
@@ -34,9 +34,10 @@ using std::stringstream;
 using std::ifstream;
 using boost::shared_ptr;
 
-CheckHashesJob::CheckHashesJob (shared_ptr<Film> f, shared_ptr<const Options> o, shared_ptr<Job> req)
+CheckHashesJob::CheckHashesJob (shared_ptr<Film> f, shared_ptr<const DecodeOptions> od, shared_ptr<const EncodeOptions> oe, shared_ptr<Job> req)
 	: Job (f, req)
-	, _opt (o)
+	, _decode_opt (od)
+	, _encode_opt (oe)
 	, _bad (0)
 {
 
@@ -61,8 +62,8 @@ CheckHashesJob::run ()
 	DCPFrameRate const dfr = dcp_frame_rate (_film->frames_per_second ());
 	
 	for (SourceFrame i = _film->dcp_trim_start(); i < N; i += dfr.skip) {
-		string const j2k_file = _opt->frame_out_path (i, false);
-		string const hash_file = j2k_file + ".md5";
+		string const j2k_file = _encode_opt->frame_out_path (i, false);
+		string const hash_file = _encode_opt->hash_out_path (i, false);
 
 		if (!boost::filesystem::exists (j2k_file)) {
 			_film->log()->log (String::compose ("Frame %1 has a missing J2K file.", i));
@@ -91,13 +92,13 @@ CheckHashesJob::run ()
 		shared_ptr<Job> tc;
 
 		if (_film->dcp_ab()) {
-			tc.reset (new ABTranscodeJob (_film, _opt, shared_from_this()));
+			tc.reset (new ABTranscodeJob (_film, _decode_opt, _encode_opt, shared_from_this()));
 		} else {
-			tc.reset (new TranscodeJob (_film, _opt, shared_from_this()));
+			tc.reset (new TranscodeJob (_film, _decode_opt, _encode_opt, shared_from_this()));
 		}
 		
 		JobManager::instance()->add_after (shared_from_this(), tc);
-		JobManager::instance()->add_after (tc, shared_ptr<Job> (new CheckHashesJob (_film, _opt, tc)));
+		JobManager::instance()->add_after (tc, shared_ptr<Job> (new CheckHashesJob (_film, _decode_opt, _encode_opt, tc)));
 	}
 		
 	set_progress (1);