projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add --version option to main DCP-o-matic.
[dcpomatic.git]
/
src
/
tools
/
dcpomatic_cli.cc
diff --git
a/src/tools/dcpomatic_cli.cc
b/src/tools/dcpomatic_cli.cc
index 9388112f6e613861a621ab20d86a222982389109..6a243e126e6a9140cf693a70c5067683758cca0a 100644
(file)
--- 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 <dir> directory containing config.xml and cinemas.xml\n"
<< " --dump just dump a summary of the film's settings; don't encode\n"
<< " -d, --dcp-path echo DCP's path to stdout on successful completion (implies -n)\n"
<< " -c, --config <dir> 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"
<< "<FILM> is the film directory.\n";
}
<< "\n"
<< "<FILM> is the film directory.\n";
}
@@
-175,7
+176,7
@@
list_servers ()
}
}
}
}
- dcpomatic_sleep (1);
+ dcpomatic_sleep
_seconds
(1);
for (int i = 0; i < N; ++i) {
cout << "\033[1A\033[2K";
for (int i = 0; i < N; ++i) {
cout << "\033[1A\033[2K";
@@
-198,6
+199,7
@@
main (int argc, char* argv[])
bool list_servers_ = false;
bool dcp_path = false;
optional<boost::filesystem::path> config;
bool list_servers_ = false;
bool dcp_path = false;
optional<boost::filesystem::path> config;
+ bool check = true;
int option_index = 0;
while (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' },
{ "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 }
};
{ 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;
if (c == -1) {
break;
@@
-266,6
+269,9
@@
main (int argc, char* argv[])
case 'c':
config = optarg;
break;
case 'c':
config = optarg;
break;
+ case 'B':
+ check = false;
+ break;
}
}
}
}
@@
-349,12
+355,12
@@
main (int argc, char* argv[])
cout << "\nMaking DCP for " << film->name() << "\n";
}
cout << "\nMaking DCP for " << film->name() << "\n";
}
- film->make_dcp ();
+ film->make_dcp (
false, check
);
bool const error = show_jobs_on_console (progress);
if (keep_going) {
while (true) {
bool const error = show_jobs_on_console (progress);
if (keep_going) {
while (true) {
- dcpomatic_sleep (3600);
+ dcpomatic_sleep
_seconds
(3600);
}
}
}
}