/*
- 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 "lib/server.h"
-#include <iostream>
-#include <stdexcept>
-#include <sstream>
-#include <cstring>
-#include <vector>
-#include <unistd.h>
-#include <errno.h>
-#include <getopt.h>
-#include <boost/array.hpp>
-#include <boost/asio.hpp>
-#include <boost/algorithm/string.hpp>
-#include <boost/thread.hpp>
-#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/file_log.h"
+#include "lib/null_log.h"
#include "lib/version.h"
+#include "lib/encode_server.h"
+#include <boost/array.hpp>
+#include <boost/asio.hpp>
+#include <boost/algorithm/string.hpp>
+#include <boost/thread.hpp>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/condition.hpp>
+#include <unistd.h>
+#include <errno.h>
+#include <getopt.h>
+#include <iostream>
+#include <stdexcept>
+#include <cstring>
+#include <vector>
using std::cerr;
using std::string;
{
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 to stdout\n"
<< " --log write a log file of activity\n";
int
main (int argc, char* argv[])
{
+ dcpomatic_setup_path_encoding ();
+ dcpomatic_setup ();
+
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'},
}
}
- Scaler::setup_scalers ();
shared_ptr<Log> log;
if (write_log) {
log.reset (new FileLog ("dcpomatic_server_cli.log"));
} else {
log.reset (new NullLog);
}
-
- Server server (log, verbose);
-
+
+ EncodeServer server (log, verbose, num_threads);
+
try {
- server.run (num_threads);
- } catch (boost::system::system_error e) {
+ server.run ();
+ } 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);