diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-07-23 21:32:04 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-07-23 21:32:04 +0100 |
| commit | 95ddf2cc72b800967b9917f75917cfdde325d2e5 (patch) | |
| tree | 0fdadc383e2c6f0a55d4ef127916d15be2d48d60 /src/lib | |
| parent | 64a5419b16d676d48f36b4699cfe83a91ec78549 (diff) | |
Add --no-check to dcpomatic_cli.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/film.cc | 15 | ||||
| -rw-r--r-- | src/lib/film.h | 2 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index 687033908..4eed5e3f0 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -297,9 +297,12 @@ Film::audio_analysis_path (shared_ptr<const Playlist> playlist) const return p; } -/** Add suitable Jobs to the JobManager to create a DCP for this Film */ +/** 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. + */ void -Film::make_dcp (bool gui) +Film::make_dcp (bool gui, bool check) { if (dcp_name().find ("/") != string::npos) { throw BadSettingError (_("name"), _("Cannot contain slashes")); @@ -353,8 +356,12 @@ Film::make_dcp (bool gui) shared_ptr<TranscodeJob> tj (new TranscodeJob (shared_from_this())); tj->set_encoder (shared_ptr<Encoder> (new DCPEncoder (shared_from_this(), tj))); - shared_ptr<CheckContentChangeJob> cc (new CheckContentChangeJob(shared_from_this(), tj, gui)); - JobManager::instance()->add (cc); + if (check) { + shared_ptr<CheckContentChangeJob> cc (new CheckContentChangeJob(shared_from_this(), tj, gui)); + JobManager::instance()->add (cc); + } else { + JobManager::instance()->add (tj); + } } /** Start a job to send our DCP to the configured TMS */ diff --git a/src/lib/film.h b/src/lib/film.h index 1c5022428..a28d81b6f 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -82,7 +82,7 @@ public: boost::filesystem::path audio_analysis_path (boost::shared_ptr<const Playlist>) const; void send_dcp_to_tms (); - void make_dcp (bool gui = false); + void make_dcp (bool gui = false, bool check = true); /** @return Logger. * It is safe to call this from any thread. |