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:13:15 +0100 |
| commit | 94ab538738526948c5a52ed1222be1e484255541 (patch) | |
| tree | f14be732d23dfac5ee41149eaee2db43b1710d32 /src/lib/film.cc | |
| parent | d41a59b6ef7a8c935f182d498ae4df0bdd66ba02 (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/lib/film.cc')
| -rw-r--r-- | src/lib/film.cc | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index 64fc04f5d..d0f0106c4 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -377,12 +377,9 @@ Film::subtitle_analysis_path (shared_ptr<const Content> content) const } -/** Add suitable Jobs to the JobManager to create a DCP for this Film. - * @param gui true if this is being called from a GUI tool. - * @param check true to check the content in the project for changes before making the DCP. - */ +/** Add suitable Jobs to the JobManager to create a DCP for this Film */ void -Film::make_dcp (bool gui, bool check) +Film::make_dcp (TranscodeJob::ChangedBehaviour behaviour) { if (dcp_name().find ("/") != string::npos) { throw BadSettingError (_("name"), _("Cannot contain slashes")); @@ -438,14 +435,9 @@ Film::make_dcp (bool gui, bool check) } LOG_GENERAL ("J2K bandwidth %1", j2k_bandwidth()); - auto tj = make_shared<TranscodeJob>(shared_from_this()); + auto tj = make_shared<TranscodeJob>(shared_from_this(), behaviour); tj->set_encoder (make_shared<DCPEncoder>(shared_from_this(), tj)); - if (check) { - auto cc = make_shared<CheckContentChangeJob>(shared_from_this(), tj, gui); - JobManager::instance()->add (cc); - } else { - JobManager::instance()->add (tj); - } + JobManager::instance()->add (tj); } /** Start a job to send our DCP to the configured TMS */ |