#include "lib/ratio.h"
#include "lib/video_content.h"
#include "lib/audio_content.h"
+#include "lib/dcpomatic_log.h"
#include <dcp/version.h>
#include <boost/foreach.hpp>
#include <getopt.h>
using std::pair;
using std::setw;
using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
using boost::optional;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
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"
- << " -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"
- << " -t, --threads specify number of local encoding threads (overriding configuration)\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"
- << " -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"
- << " --dump just dump a summary of the film's settings; don't encode\n"
+ << " -v, --version show DCP-o-matic version\n"
+ << " -h, --help show this help\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"
+ << " -t, --threads specify number of local encoding threads (overriding configuration)\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"
+ << " -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"
+ << " --no-check don't check project's content files for changes before making the DCP\n"
<< "\n"
<< "<FILM> is the film directory.\n";
}
cout << "\n"
<< c->path(0) << "\n"
<< "\tat " << c->position().seconds ()
- << " length " << c->full_length().seconds ()
+ << " length " << c->full_length(film).seconds ()
<< " start trim " << c->trim_start().seconds ()
<< " end trim " << c->trim_end().seconds () << "\n";
if (c->video) {
cout << "\t" << c->video->size().width << "x" << c->video->size().height << "\n"
- << "\t" << c->active_video_frame_rate() << "fps\n"
+ << "\t" << c->active_video_frame_rate(film) << "fps\n"
<< "\tcrop left " << c->video->left_crop()
<< " right " << c->video->right_crop()
<< " top " << c->video->top_crop()
- << " bottom " << c->video->bottom_crop() << "\n"
- << "\tscale " << c->video->scale().name() << "\n";
+ << " bottom " << c->video->bottom_crop() << "\n";
+ if (c->video->custom_ratio()) {
+ cout << "\tscale to custom ratio " << *c->video->custom_ratio() << ":1\n";
+ }
if (c->video->colour_conversion()) {
if (c->video->colour_conversion().get().preset()) {
cout << "\tcolour conversion "
{
while (true) {
int N = 0;
- list<EncodeServerDescription> servers = EncodeServerFinder::instance()->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;
}
}
- dcpomatic_sleep (1);
+ dcpomatic_sleep_seconds (1);
for (int i = 0; i < N; ++i) {
cout << "\033[1A\033[2K";
optional<int> json_port;
bool keep_going = false;
bool dump = false;
+ optional<boost::filesystem::path> servers;
bool list_servers_ = false;
bool dcp_path = false;
+ optional<boost::filesystem::path> config;
+ bool check = true;
int option_index = 0;
while (true) {
{ "threads", required_argument, 0, 't'},
{ "json", required_argument, 0, 'j'},
{ "keep-going", no_argument, 0, 'k' },
+ { "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' },
+ { "no-check", no_argument, 0, 'B' },
{ 0, 0, 0, 0 }
};
- int c = getopt_long (argc, argv, "vhfnrt:j:kAld", long_options, &option_index);
+ int c = getopt_long (argc, argv, "vhfnrt:j:kAs:ldc:B", long_options, &option_index);
if (c == -1) {
break;
case 'A':
dump = true;
break;
+ case 's':
+ servers = optarg;
+ break;
case 'l':
list_servers_ = true;
break;
dcp_path = true;
progress = false;
break;
+ case 'c':
+ config = optarg;
+ break;
+ case 'B':
+ check = false;
+ break;
+ }
+ }
+
+ if (config) {
+ State::override_path = *config;
+ }
+
+ if (servers) {
+ FILE* f = fopen_boost (*servers, "r");
+ if (!f) {
+ cerr << "Could not open servers list file " << *servers << "\n";
+ exit (EXIT_FAILURE);
+ }
+ vector<string> servers;
+ while (!feof (f)) {
+ char buffer[128];
+ if (fscanf (f, "%s.127", buffer) == 1) {
+ servers.push_back (buffer);
+ }
}
+ fclose (f);
+ Config::instance()->set_servers (servers);
}
if (list_servers_) {
exit (EXIT_SUCCESS);
}
+ dcpomatic_log = film->log ();
+
ContentList content = film->content ();
for (ContentList::const_iterator i = content.begin(); i != content.end(); ++i) {
vector<boost::filesystem::path> paths = (*i)->paths ();
cout << "\nMaking DCP for " << film->name() << "\n";
}
- film->make_dcp ();
-
- bool should_stop = false;
- bool first = true;
- bool error = false;
- while (!should_stop) {
-
- dcpomatic_sleep (5);
-
- list<shared_ptr<Job> > jobs = JobManager::instance()->get ();
-
- if (!first && progress) {
- for (size_t i = 0; i < jobs.size(); ++i) {
- cout << "\033[1A\033[2K";
- }
- cout.flush ();
- }
-
- first = false;
-
- int unfinished = 0;
- int finished_in_error = 0;
-
- BOOST_FOREACH (shared_ptr<Job> i, jobs) {
- if (progress) {
- cout << i->name();
- if (!i->sub_name().empty()) {
- cout << "; " << i->sub_name();
- }
- cout << ": ";
-
- if (i->progress ()) {
- cout << i->status() << " \n";
- } else {
- cout << ": Running \n";
- }
- }
-
- if (!i->finished ()) {
- ++unfinished;
- }
-
- if (i->finished_in_error ()) {
- ++finished_in_error;
- error = true;
- }
-
- if (!progress && i->finished_in_error ()) {
- /* We won't see this error if we haven't been showing progress,
- so show it now.
- */
- cout << i->status() << "\n";
- }
- }
-
- if (unfinished == 0 || finished_in_error != 0) {
- should_stop = true;
- }
- }
+ film->make_dcp (false, check);
+ bool const error = show_jobs_on_console (progress);
if (keep_going) {
while (true) {
- dcpomatic_sleep (3600);
+ dcpomatic_sleep_seconds (3600);
}
}
projects / dcpomatic.git / blobdiff