projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move make_dcp() out of Film (#2132).
[dcpomatic.git]
/
src
/
tools
/
dcpomatic_cli.cc
diff --git
a/src/tools/dcpomatic_cli.cc
b/src/tools/dcpomatic_cli.cc
index 18ffcee903c96531ffe37d31b35af36257d5c004..71353d463858e9ee5da47cd01e5d39aa8445fd0c 100644
(file)
--- 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/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"
#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);
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 {
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);
}
}
} 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) {
bool const error = show_jobs_on_console (progress);
if (keep_going) {