#include "lib/server.h"
#include <iostream>
#include <stdexcept>
-#include <sstream>
#include <cstring>
#include <vector>
#include <unistd.h>
#include <boost/thread/mutex.hpp>
#include <boost/thread/condition.hpp>
#include "lib/config.h"
-#include "lib/dcp_video_frame.h"
+#include "lib/dcp_video.h"
#include "lib/exceptions.h"
#include "lib/util.h"
#include "lib/config.h"
-#include "lib/scaler.h"
#include "lib/image.h"
#include "lib/log.h"
#include "lib/version.h"
{
cerr << "Syntax: " << n << " [OPTION]\n"
<< " -v, --version show DCP-o-matic version\n"
- << " -h, --help show this help\n"
+ << " -h, --help show this help\n"
<< " -t, --threads number of parallel encoding threads to use\n"
- << " --verbose be verbose\n";
+ << " --verbose be verbose to stdout\n"
+ << " --log write a log file of activity\n";
}
int
{
int num_threads = Config::instance()->num_local_encoding_threads ();
bool verbose = false;
+ bool write_log = false;
int option_index = 0;
- while (1) {
+ while (true) {
static struct option long_options[] = {
{ "version", no_argument, 0, 'v'},
{ "help", no_argument, 0, 'h'},
{ "threads", required_argument, 0, 't'},
{ "verbose", no_argument, 0, 'A'},
+ { "log", no_argument, 0, 'B'},
{ 0, 0, 0, 0 }
};
- int c = getopt_long (argc, argv, "vht:", long_options, &option_index);
+ int c = getopt_long (argc, argv, "vht:AB", long_options, &option_index);
if (c == -1) {
break;
case 'A':
verbose = true;
break;
+ case 'B':
+ write_log = true;
+ break;
}
}
- Scaler::setup_scalers ();
- shared_ptr<FileLog> log (new FileLog ("dcpomatic_server_cli.log"));
+ shared_ptr<Log> log;
+ if (write_log) {
+ log.reset (new FileLog ("dcpomatic_server_cli.log"));
+ } else {
+ log.reset (new NullLog);
+ }
+
Server server (log, verbose);
- server.run (num_threads);
+
+ try {
+ server.run (num_threads);
+ } catch (boost::system::system_error& e) {
+ if (e.code() == boost::system::errc::address_in_use) {
+ cerr << argv[0] << ": address already in use. Is another DCP-o-matic server instance already running?\n";
+ exit (EXIT_FAILURE);
+ }
+ cerr << argv[0] << ": " << e.what() << "\n";
+ }
return 0;
}