X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_cli.cc;h=ca6c79cb8b9b4f96b63d6e93122714df653e5ad8;hb=9e2f6b6df1e54d3d13bfa9332a1c2c03f63428db;hp=f049c0c919cc6fc12a6b87150ba6b0a0b85a8976;hpb=985e727e001e1a92ae035364a9cbf1ff99522ff1;p=dcpomatic.git
diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index f049c0c91..ca6c79cb8 100644
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -68,6 +68,7 @@ help (string n)
<< " -d, --dcp-path echo DCP's path to stdout on successful completion (implies -n)\n"
<< " -c, --config
directory containing config.xml and cinemas.xml\n"
<< " --dump just dump a summary of the film's settings; don't encode\n"
+ << " --no-check don't check project's content files for changes before making the DCP\n"
<< "\n"
<< " is the film directory.\n";
}
@@ -198,6 +199,7 @@ main (int argc, char* argv[])
bool list_servers_ = false;
bool dcp_path = false;
optional config;
+ bool check = true;
int option_index = 0;
while (true) {
@@ -216,10 +218,11 @@ main (int argc, char* argv[])
{ "config", required_argument, 0, 'c' },
/* Just using A, B, C ... from here on */
{ "dump", no_argument, 0, 'A' },
+ { "no-check", no_argument, 0, 'B' },
{ 0, 0, 0, 0 }
};
- int c = getopt_long (argc, argv, "vhfnrt:j:kAs:ldc:", long_options, &option_index);
+ int c = getopt_long (argc, argv, "vhfnrt:j:kAs:ldc:B", long_options, &option_index);
if (c == -1) {
break;
@@ -266,6 +269,9 @@ main (int argc, char* argv[])
case 'c':
config = optarg;
break;
+ case 'B':
+ check = false;
+ break;
}
}
@@ -349,65 +355,8 @@ main (int argc, char* argv[])
cout << "\nMaking DCP for " << film->name() << "\n";
}
- film->make_dcp ();
-
- bool should_stop = false;
- bool first = true;
- bool error = false;
- while (!should_stop) {
-
- dcpomatic_sleep (5);
-
- list > jobs = JobManager::instance()->get ();
-
- if (!first && progress) {
- for (size_t i = 0; i < jobs.size(); ++i) {
- cout << "\033[1A\033[2K";
- }
- cout.flush ();
- }
-
- first = false;
-
- int unfinished = 0;
- int finished_in_error = 0;
-
- BOOST_FOREACH (shared_ptr i, jobs) {
- if (progress) {
- cout << i->name();
- if (!i->sub_name().empty()) {
- cout << "; " << i->sub_name();
- }
- cout << ": ";
-
- if (i->progress ()) {
- cout << i->status() << " \n";
- } else {
- cout << ": Running \n";
- }
- }
-
- if (!i->finished ()) {
- ++unfinished;
- }
-
- if (i->finished_in_error ()) {
- ++finished_in_error;
- error = true;
- }
-
- if (!progress && i->finished_in_error ()) {
- /* We won't see this error if we haven't been showing progress,
- so show it now.
- */
- cout << i->status() << "\n";
- }
- }
-
- if (unfinished == 0 || finished_in_error != 0) {
- should_stop = true;
- }
- }
+ film->make_dcp (false, check);
+ bool const error = show_jobs_on_console (progress);
if (keep_going) {
while (true) {