/*
Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ DCP-o-matic is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
<< " -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 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"
<< "\n"
<< "<FILM> is the film directory.\n";
<< " start trim " << c->trim_start().seconds ()
<< " end trim " << c->trim_end().seconds () << "\n";
- shared_ptr<VideoContent> video = dynamic_pointer_cast<VideoContent> (c);
- if (video) {
- cout << "\t" << video->video_size().width << "x" << video->video_size().height << "\n"
- << "\t" << video->video_frame_rate() << "fps\n"
- << "\tcrop left " << video->left_crop()
- << " right " << video->right_crop()
- << " top " << video->top_crop()
- << " bottom " << video->bottom_crop() << "\n"
- << "\tscale " << video->scale().name() << "\n";
- if (video->colour_conversion()) {
- if (video->colour_conversion().get().preset()) {
+ if (c->video) {
+ cout << "\t" << c->video->size().width << "x" << c->video->size().height << "\n"
+ << "\t" << c->active_video_frame_rate() << "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";
+ if (c->video->colour_conversion()) {
+ if (c->video->colour_conversion().get().preset()) {
cout << "\tcolour conversion "
- << PresetColourConversion::all()[video->colour_conversion().get().preset().get()].name
+ << PresetColourConversion::all()[c->video->colour_conversion().get().preset().get()].name
<< "\n";
} else {
cout << "\tcustom colour conversion\n";
}
- shared_ptr<AudioContent> audio = dynamic_pointer_cast<AudioContent> (c);
- if (audio) {
- cout << "\t" << audio->audio_delay() << " delay\n"
- << "\t" << audio->audio_gain() << " gain\n";
+ if (c->audio) {
+ cout << "\t" << c->audio->delay() << " delay\n"
+ << "\t" << c->audio->gain() << " gain\n";
}
}
}
bool keep_going = false;
bool dump = false;
bool servers = false;
+ bool dcp_path = false;
int option_index = 0;
while (true) {
{ "json", required_argument, 0, 'j'},
{ "keep-going", no_argument, 0, 'k' },
{ "servers", no_argument, 0, 's' },
+ { "dcp-path", no_argument, 0, 'd' },
/* Just using A, B, C ... from here on */
{ "dump", no_argument, 0, 'A' },
{ 0, 0, 0, 0 }
};
- int c = getopt_long (argc, argv, "vhfnrj:kAs", long_options, &option_index);
+ int c = getopt_long (argc, argv, "vhfnrj:kAsd", long_options, &option_index);
if (c == -1) {
break;
case 's':
servers = true;
break;
+ case 'd':
+ dcp_path = true;
+ progress = false;
+ break;
}
}
signal_manager = new SignalManager ();
if (no_remote) {
- EncodeServerFinder::instance()->disable ();
+ EncodeServerFinder::instance()->stop ();
}
if (json_port) {
int unfinished = 0;
int finished_in_error = 0;
- for (list<shared_ptr<Job> >::iterator i = jobs.begin(); i != jobs.end(); ++i) {
+ BOOST_FOREACH (shared_ptr<Job> i, jobs) {
if (progress) {
- cout << (*i)->name() << ": ";
+ cout << i->name();
+ if (!i->sub_name().empty()) {
+ cout << "; " << i->sub_name();
+ }
+ cout << ": ";
- if ((*i)->progress ()) {
- cout << (*i)->status() << " \n";
+ if (i->progress ()) {
+ cout << i->status() << " \n";
} else {
cout << ": Running \n";
}
}
- if (!(*i)->finished ()) {
+ if (!i->finished ()) {
++unfinished;
}
- if ((*i)->finished_in_error ()) {
+ if (i->finished_in_error ()) {
++finished_in_error;
error = true;
}
- if (!progress && (*i)->finished_in_error ()) {
+ 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";
+ cout << i->status() << "\n";
}
}
EncodeServerFinder::drop ();
+ if (dcp_path && !error) {
+ cout << film->dir (film->dcp_name (false)).string() << "\n";
+ }
+
return error ? EXIT_FAILURE : EXIT_SUCCESS;
}
projects / dcpomatic.git / blobdiff