X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_create.cc;h=a3adc8e3e32312567c5bd0411abeba232ec05ac7;hb=1a693725f9a8cc6ba58f65b2f1ef03255d295f23;hp=3d07933e28d68c55443911c5741126e606de0a72;hpb=99428af22969a6cfb1dbd2053a9356bb23b3182f;p=dcpomatic.git diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc index 3d07933e2..a3adc8e3e 100644 --- a/src/tools/dcpomatic_create.cc +++ b/src/tools/dcpomatic_create.cc @@ -1,28 +1,23 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-2016 Carl Hetherington - 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 . */ -#include -#include -#include -#include -#include -#include #include "lib/version.h" #include "lib/film.h" #include "lib/util.h" @@ -33,6 +28,14 @@ #include "lib/dcp_content_type.h" #include "lib/ratio.h" #include "lib/image_content.h" +#include "lib/video_content.h" +#include +#include +#include +#include +#include +#include +#include using std::string; using std::cout; @@ -41,6 +44,7 @@ using std::list; using std::exception; using boost::shared_ptr; using boost::dynamic_pointer_cast; +using boost::optional; static void syntax (string n) @@ -49,11 +53,14 @@ syntax (string n) << " -v, --version show DCP-o-matic version\n" << " -h, --help show this help\n" << " -n, --name film name\n" + << " -t, --template template name\n" << " -c, --dcp-content-type FTR, SHR, TLR, TST, XSN, RTG, TSR, POL, PSA or ADV\n" << " --container-ratio 119, 133, 137, 138, 166, 178, 185 or 239\n" << " --content-ratio 119, 133, 137, 138, 166, 178, 185 or 239\n" << " -s, --still-length number of seconds that still content should last\n" << " --standard SMPTE or interop (default SMPTE)\n" + << " --no-use-isdcf-name do not use an ISDCF name; use the specified name unmodified\n" + << " --no-sign do not sign the DCP\n" << " -o, --output output directory\n"; } @@ -63,6 +70,8 @@ help (string n) cerr << "Create a film directory (ready for making a DCP) or metadata file from some content files.\n" << "A film directory will be created if -o or --output is specified, otherwise a metadata file\n" << "will be written to stdout.\n"; + + syntax (n); } class SimpleSignalManager : public SignalManager @@ -77,15 +86,19 @@ public: int main (int argc, char* argv[]) { + dcpomatic_setup_path_encoding (); dcpomatic_setup (); string name; + optional template_name; DCPContentType const * dcp_content_type = DCPContentType::from_isdcf_name ("TST"); Ratio const * container_ratio = 0; Ratio const * content_ratio = 0; int still_length = 10; dcp::Standard standard = dcp::SMPTE; boost::filesystem::path output; + bool sign = true; + bool use_isdcf_name = true; int option_index = 0; while (true) { @@ -93,16 +106,19 @@ main (int argc, char* argv[]) { "version", no_argument, 0, 'v'}, { "help", no_argument, 0, 'h'}, { "name", required_argument, 0, 'n'}, + { "template", required_argument, 0, 'f'}, { "dcp-content-type", required_argument, 0, 'c'}, { "container-ratio", required_argument, 0, 'A'}, { "content-ratio", required_argument, 0, 'B'}, { "still-length", required_argument, 0, 's'}, { "standard", required_argument, 0, 'C'}, + { "no-use-isdcf-name", no_argument, 0, 'D'}, + { "no-sign", no_argument, 0, 'E'}, { "output", required_argument, 0, 'o'}, { 0, 0, 0, 0} }; - int c = getopt_long (argc, argv, "vhn:c:A:B:C:s:o:", long_options, &option_index); + int c = getopt_long (argc, argv, "vhn:f:c:A:B:C:s:o:DE", long_options, &option_index); if (c == -1) { break; } @@ -117,6 +133,9 @@ main (int argc, char* argv[]) case 'n': name = optarg; break; + case 't': + template_name = optarg; + break; case 'c': dcp_content_type = DCPContentType::from_isdcf_name (optarg); if (dcp_content_type == 0) { @@ -150,12 +169,21 @@ main (int argc, char* argv[]) exit (EXIT_FAILURE); } break; + case 'D': + use_isdcf_name = false; + break; + case 'E': + sign = false; + break; case 's': still_length = atoi (optarg); break; case 'o': output = optarg; break; + case '?': + syntax (argv[0]); + exit (EXIT_FAILURE); } } @@ -180,21 +208,27 @@ main (int argc, char* argv[]) signal_manager = new SimpleSignalManager (); + if (name.empty ()) { + name = boost::filesystem::path (argv[optind]).leaf().string (); + } + try { - shared_ptr film (new Film (output, false)); - if (!name.empty ()) { - film->set_name (name); + shared_ptr film (new Film (output)); + if (template_name) { + film->use_template (template_name.get()); } + film->set_name (name); film->set_container (container_ratio); film->set_dcp_content_type (dcp_content_type); film->set_interop (standard == dcp::INTEROP); + film->set_use_isdcf_name (use_isdcf_name); + film->set_signed (sign); for (int i = optind; i < argc; ++i) { - shared_ptr c = content_factory (film, argv[i]); - shared_ptr vc = dynamic_pointer_cast (c); - if (vc) { - vc->set_scale (VideoContentScale (content_ratio)); + shared_ptr c = content_factory (film, boost::filesystem::canonical (argv[i])); + if (c->video) { + c->video->set_scale (VideoContentScale (content_ratio)); } film->examine_and_add_content (c); } @@ -208,7 +242,7 @@ main (int argc, char* argv[]) for (ContentList::iterator i = content.begin(); i != content.end(); ++i) { shared_ptr ic = dynamic_pointer_cast (*i); if (ic) { - ic->set_video_length (still_length * 24); + ic->video->set_length (still_length * 24); } }