<< " -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";
{
while (true) {
int N = 0;
- list<EncodeServerDescription> servers = EncodeServerFinder::instance()->good_servers ();
+ list<EncodeServerDescription> servers = EncodeServerFinder::instance()->servers();
/* This is a bit fiddly because we want to list configured servers that are down as well
as all those (configured and found by broadcast) that are up.
optional<int> threads;
list<EncodeServerDescription>::iterator j = servers.begin ();
while (j != servers.end ()) {
- if (i == j->host_name()) {
+ if (i == j->host_name() && j->current_link_version()) {
threads = j->threads();
list<EncodeServerDescription>::iterator tmp = j;
++tmp;
/* Now report any left that have been found by broadcast */
BOOST_FOREACH (EncodeServerDescription const & i, servers) {
- cout << std::left << setw(24) << i.host_name() << " UP " << i.threads() << "\n";
+ if (i.current_link_version()) {
+ cout << std::left << setw(24) << i.host_name() << " UP " << i.threads() << "\n";
+ } else {
+ cout << std::left << setw(24) << i.host_name() << " bad version\n";
+ }
++N;
}
-
- /* And those that have a bad version */
- BOOST_FOREACH (EncodeServerDescription i, EncodeServerFinder::instance()->good_servers()) {
- cout << std::left << setw(24) << i.host_name() << " bad version\n";
- }
}
dcpomatic_sleep (1);
optional<boost::filesystem::path> servers;
bool list_servers_ = false;
bool dcp_path = false;
+ optional<boost::filesystem::path> config;
int option_index = 0;
while (true) {
{ "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;
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) {