diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-04-29 00:37:13 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-04-29 00:37:13 +0100 |
| commit | 04badd0c82d3ce82ee87c07e120e585899d4acff (patch) | |
| tree | a58dfba6872d7bf2f1a9e7c462e41af12e964906 /src/tools/dcpomatic_cli.cc | |
| parent | e935952ec68482352294fed637d4bfa533120e36 (diff) | |
Allow command-line configuration of config location (#1284).
Diffstat (limited to 'src/tools/dcpomatic_cli.cc')
| -rw-r--r-- | src/tools/dcpomatic_cli.cc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc index 788594f0c..7fc5ed55d 100644 --- a/src/tools/dcpomatic_cli.cc +++ b/src/tools/dcpomatic_cli.cc @@ -65,6 +65,7 @@ help (string n) << " -s, --servers <file> specify servers to use in a text file\n" << " -l, --list-servers just display a list of encoding servers that DCP-o-matic is configured to use; 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" << "\n" << "<FILM> is the film directory.\n"; @@ -195,6 +196,7 @@ main (int argc, char* argv[]) optional<boost::filesystem::path> servers; bool list_servers_ = false; bool dcp_path = false; + optional<boost::filesystem::path> config; int option_index = 0; while (true) { @@ -210,12 +212,13 @@ main (int argc, char* argv[]) { "servers", required_argument, 0, 's' }, { "list-servers", no_argument, 0, 'l' }, { "dcp-path", no_argument, 0, 'd' }, + { "config", required_argument, 0, 'c' }, /* Just using A, B, C ... from here on */ { "dump", no_argument, 0, 'A' }, { 0, 0, 0, 0 } }; - int c = getopt_long (argc, argv, "vhfnrt:j:kAs:ld", long_options, &option_index); + int c = getopt_long (argc, argv, "vhfnrt:j:kAs:ldc:", long_options, &option_index); if (c == -1) { break; @@ -259,9 +262,16 @@ main (int argc, char* argv[]) dcp_path = true; progress = false; break; + case 'c': + config = optarg; + break; } } + if (config) { + Config::override_path = *config; + } + if (servers) { FILE* f = fopen_boost (*servers, "r"); if (!f) { |