summaryrefslogtreecommitdiff
path: root/src/tools/dcpomatic_cli.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-12-18 14:23:50 +0100
committerCarl Hetherington <cth@carlh.net>2022-04-20 19:35:36 +0200
commitdf5228d00d70d68218e7f606131a0c5fa2caba9f (patch)
tree7362b301f4693051a8722945378d11d9a0ef4c1d /src/tools/dcpomatic_cli.cc
parent6e0f867a69cf4e337370edc986347218afde548e (diff)
Move make_dcp() out of Film (#2132).
Diffstat (limited to 'src/tools/dcpomatic_cli.cc')
-rw-r--r--src/tools/dcpomatic_cli.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index 18ffcee90..71353d463 100644
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -30,6 +30,7 @@
#include "lib/job_manager.h"
#include "lib/json_server.h"
#include "lib/log.h"
+#include "lib/make_dcp.h"
#include "lib/ratio.h"
#include "lib/signal_manager.h"
#include "lib/transcode_job.h"
@@ -393,7 +394,7 @@ main (int argc, char* argv[])
}
}
- TranscodeJob::ChangedBehaviour behaviour = check ? TranscodeJob::ChangedBehaviour::STOP : TranscodeJob::ChangedBehaviour::IGNORE;
+ TranscodeJob::ChangedBehaviour const behaviour = check ? TranscodeJob::ChangedBehaviour::STOP : TranscodeJob::ChangedBehaviour::IGNORE;
if (export_format) {
auto job = std::make_shared<TranscodeJob>(film, behaviour);
@@ -405,13 +406,14 @@ main (int argc, char* argv[])
JobManager::instance()->add (job);
} else {
try {
- film->make_dcp (behaviour);
+ make_dcp (film, behaviour);
} catch (runtime_error& e) {
std::cerr << "Could not make DCP: " << e.what() << "\n";
exit(EXIT_FAILURE);
}
}
+ make_dcp (film, behaviour);
bool const error = show_jobs_on_console (progress);
if (keep_going) {