X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_create.cc;h=a3adc8e3e32312567c5bd0411abeba232ec05ac7;hb=3a56fa86d04c631143a45bdb34cb0e570e4ca9fb;hp=3697b4e8bb055adc13d156ceed6cf6dc94ba413f;hpb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;p=dcpomatic.git diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc index 3697b4e8b..a3adc8e3e 100644 --- a/src/tools/dcpomatic_create.cc +++ b/src/tools/dcpomatic_create.cc @@ -31,7 +31,6 @@ #include "lib/video_content.h" #include #include -#include #include #include #include @@ -44,8 +43,8 @@ using std::cerr; using std::list; using std::exception; using boost::shared_ptr; -using boost::make_shared; using boost::dynamic_pointer_cast; +using boost::optional; static void syntax (string n) @@ -54,6 +53,7 @@ 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" @@ -90,6 +90,7 @@ main (int argc, char* argv[]) 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; @@ -105,6 +106,7 @@ 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'}, @@ -116,7 +118,7 @@ main (int argc, char* argv[]) { 0, 0, 0, 0} }; - int c = getopt_long (argc, argv, "vhn:c:A:B:C:s:o:DE", 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; } @@ -131,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) { @@ -208,7 +213,10 @@ main (int argc, char* argv[]) } try { - shared_ptr film = make_shared (output, false); + shared_ptr film (new Film (output)); + if (template_name) { + film->use_template (template_name.get()); + } film->set_name (name); film->set_container (container_ratio);