Rearrange checking (and re-examining) content.

Most importantly, checking of content for changes before making
a DCP is now done in the TranscodeJob (rather than being in a
separate job).  This makes things a little neater and also makes
the batch converter less confusing when you add a job whose content
has changed.

3 files changed, 6 insertions, 6 deletions

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 0b7f632e1..70abcf3b7 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -799,7 +799,7 @@ private:
 			   a long time, and crashes/power failures are moderately likely.
 			*/
 			_film->write_metadata ();
-			_film->make_dcp (true);
+			_film->make_dcp (TranscodeJob::ChangedBehaviour::EXAMINE_THEN_STOP);
 		} catch (BadSettingError& e) {
 			error_dialog (this, wxString::Format (_("Bad setting for %s."), std_to_wx(e.setting()).data()), std_to_wx(e.what()));
 		} catch (std::exception& e) {
@@ -993,7 +993,7 @@ private:
 				}
 			}
 
-			auto job = make_shared<TranscodeJob>(_film);
+			auto job = make_shared<TranscodeJob>(_film, TranscodeJob::ChangedBehaviour::EXAMINE_THEN_STOP);
 			job->set_encoder (
 				make_shared<FFmpegEncoder> (
 					_film, job, d->path(), d->format(), d->mixdown_to_stereo(), d->split_reels(), d->split_streams(), d->x264_crf())
@@ -1008,7 +1008,7 @@ private:
 	{
 		auto d = new ExportSubtitlesDialog (this, _film->reels().size(), _film->interop());
 		if (d->ShowModal() == wxID_OK) {
-			auto job = make_shared<TranscodeJob>(_film);
+			auto job = make_shared<TranscodeJob>(_film, TranscodeJob::ChangedBehaviour::EXAMINE_THEN_STOP);
 			job->set_encoder (
 				make_shared<SubtitleEncoder>(_film, job, d->path(), _film->isdcf_name(true), d->split_reels(), d->include_font())
 				);
diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc
index 061470602..29f79ff08 100644
--- a/src/tools/dcpomatic_batch.cc
+++ b/src/tools/dcpomatic_batch.cc
@@ -211,7 +211,7 @@ public:
 				}
 			}
 
-			film->make_dcp ();
+			film->make_dcp (TranscodeJob::ChangedBehaviour::STOP);
 		} catch (std::exception& e) {
 			auto p = std_to_wx (path.string ());
 			auto b = p.ToUTF8 ();
@@ -450,7 +450,7 @@ class App : public wxApp
 				try {
 					film = make_shared<Film>(i);
 					film->read_metadata ();
-					film->make_dcp ();
+					film->make_dcp (TranscodeJob::ChangedBehaviour::EXAMINE_THEN_STOP);
 				} catch (exception& e) {
 					error_dialog (
 						0,
diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index 75f57fa89..95f2f4039 100644
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -355,7 +355,7 @@ main (int argc, char* argv[])
 		cout << "\nMaking DCP for " << film->name() << "\n";
 	}
 
-	film->make_dcp (false, check);
+	film->make_dcp (check ? TranscodeJob::ChangedBehaviour::STOP : TranscodeJob::ChangedBehaviour::IGNORE);
 	bool const error = show_jobs_on_console (progress);
 
 	if (keep_going) {