diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-11-28 10:39:03 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-11-28 21:08:08 +0100 |
| commit | a2e41d9a95b6e0000f3a54f513214130f8b6ca9f (patch) | |
| tree | 8387b4fe016bbd7fad09526a872ae5ef295f4d5a /src/tools/dcpomatic.cc | |
| parent | 4ee083dc0862b30325c709e913772a6898378d0e (diff) | |
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.
Diffstat (limited to 'src/tools/dcpomatic.cc')
| -rw-r--r-- | src/tools/dcpomatic.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 2cc3187d6..0f86b4940 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -798,7 +798,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) { @@ -992,7 +992,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()) @@ -1007,7 +1007,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()) ); |