/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include <iostream>
#include <iomanip>
#include <getopt.h>
-#include <libdcp/version.h>
+#include <dcp/version.h>
#include "lib/film.h"
#include "lib/filter.h"
#include "lib/transcode_job.h"
#include "lib/job_manager.h"
#include "lib/util.h"
-#include "lib/scaler.h"
#include "lib/version.h"
#include "lib/cross.h"
#include "lib/config.h"
#include "lib/log.h"
#include "lib/ui_signaller.h"
#include "lib/server_finder.h"
+#include "lib/json_server.h"
using std::string;
using std::cerr;
using std::pair;
using std::list;
using boost::shared_ptr;
+using boost::optional;
static void
help (string n)
cerr << "Syntax: " << n << " [OPTION] <FILM>\n"
<< " -v, --version show DCP-o-matic version\n"
<< " -h, --help show this help\n"
- << " -d, --deps list DCP-o-matic dependency details and quit\n"
<< " -f, --flags show flags passed to C++ compiler on build\n"
<< " -n, --no-progress do not print progress to stdout\n"
<< " -r, --no-remote do not use any remote servers\n"
+ << " -j, --json <port> run a JSON server on the specified port\n"
<< " -k, --keep-going keep running even when the job is complete\n"
<< "\n"
<< "<FILM> is the film directory.\n";
string film_dir;
bool progress = true;
bool no_remote = false;
+ optional<int> json_port;
bool keep_going = false;
int option_index = 0;
static struct option long_options[] = {
{ "version", no_argument, 0, 'v'},
{ "help", no_argument, 0, 'h'},
- { "deps", no_argument, 0, 'd'},
{ "flags", no_argument, 0, 'f'},
{ "no-progress", no_argument, 0, 'n'},
{ "no-remote", no_argument, 0, 'r'},
+ { "json", required_argument, 0, 'j'},
{ "keep-going", no_argument, 0, 'k' },
{ 0, 0, 0, 0 }
};
- int c = getopt_long (argc, argv, "vhdfnrk", long_options, &option_index);
+ int c = getopt_long (argc, argv, "vhfnrj:k", long_options, &option_index);
if (c == -1) {
break;
case 'h':
help (argv[0]);
exit (EXIT_SUCCESS);
- case 'd':
- cout << dependency_version_summary () << "\n";
- exit (EXIT_SUCCESS);
case 'f':
cout << dcpomatic_cxx_flags << "\n";
exit (EXIT_SUCCESS);
case 'r':
no_remote = true;
break;
+ case 'j':
+ json_port = atoi (optarg);
+ break;
case 'k':
keep_going = true;
break;
dcpomatic_setup ();
ui_signaller = new UISignaller ();
-
+
if (no_remote) {
ServerFinder::instance()->disable ();
}
+ if (json_port) {
+ new JSONServer (json_port.get ());
+ }
+
cout << "DCP-o-matic " << dcpomatic_version << " git " << dcpomatic_git_commit;
char buf[256];
if (gethostname (buf, 256) == 0) {
if (progress) {
cout << (*i)->name() << ": ";
- float const p = (*i)->progress ();
-
- if (p >= 0) {
+ if ((*i)->progress ()) {
cout << (*i)->status() << " \n";
} else {
cout << ": Running \n";
indirectly holding onto codecs.
*/
JobManager::drop ();
+
+ ServerFinder::drop ();
return error ? EXIT_FAILURE : EXIT_SUCCESS;
}