X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcreate_cli.cc;h=a6e13c8bc04a26ed0df26aaabf0c2f9b8b72c4f0;hp=9453cc1671964614c70d6d51eb096a355ff6c74a;hb=b0fc1ec3b159b7a7fa917f2e338485921800374e;hpb=f7610c3c202df736c518a826bef21da41df38aa4

diff --git a/src/lib/create_cli.cc b/src/lib/create_cli.cc
index 9453cc167..a6e13c8bc 100644
--- a/src/lib/create_cli.cc
+++ b/src/lib/create_cli.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2019-2021 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2019-2022 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -47,16 +47,18 @@ string CreateCLI::_help =
 	"  -s, --still-length <n>        number of seconds that still content should last\n"
 	"      --standard <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"
 	"      --config <dir>            directory containing config.xml and cinemas.xml\n"
-	"      --fourk                   make a 4K DCP rather than a 2K one\n"
+	"      --twok                    make a 2K DCP instead of choosing a resolution based on the content\n"
+	"      --fourk                   make a 4K DCP instead of choosing a resolution based on the content\n"
 	"  -o, --output <dir>            output directory\n"
 	"      --threed                  make a 3D DCP\n"
 	"      --j2k-bandwidth <Mbit/s>  J2K bandwidth in Mbit/s\n"
 	"      --left-eye                next piece of content is for the left eye\n"
 	"      --right-eye               next piece of content is for the right eye\n"
 	"      --channel <channel>       next piece of content should be mapped to audio channel L, R, C, Lfe, Ls or Rs\n"
-	"      --gain                    next piece of content should have the given audio gain (in dB)\n";
+	"      --gain                    next piece of content should have the given audio gain (in dB)\n"
+	"      --cpl <id>                CPL ID to use from the next piece of content (which is a DCP)\n"
+	"      --kdm <file>              KDM for next piece of content\n";
 
 
 template <class T>
@@ -124,6 +126,7 @@ CreateCLI::CreateCLI (int argc, char* argv[])
 	, still_length (10)
 	, standard (dcp::Standard::SMPTE)
 	, no_use_isdcf_name (false)
+	, twok (false)
 	, fourk (false)
 {
 	string dcp_content_type_string = "TST";
@@ -135,6 +138,8 @@ CreateCLI::CreateCLI (int argc, char* argv[])
 	auto next_frame_type = VideoFrameType::TWO_D;
 	optional<dcp::Channel> channel;
 	optional<float> gain;
+	optional<boost::filesystem::path> kdm;
+	optional<std::string> cpl;
 
 	int i = 1;
 	while (i < argc) {
@@ -163,6 +168,9 @@ CreateCLI::CreateCLI (int argc, char* argv[])
 		} else if (a == "--right-eye") {
 			next_frame_type = VideoFrameType::THREE_D_RIGHT;
 			claimed = true;
+		} else if (a == "--twok") {
+			twok = true;
+			claimed = true;
 		} else if (a == "--fourk") {
 			fourk = true;
 			claimed = true;
@@ -203,6 +211,8 @@ CreateCLI::CreateCLI (int argc, char* argv[])
 
 		argument_option(i, argc, argv, "", "--channel", &claimed, &error, &channel, convert_channel);
 		argument_option(i, argc, argv, "", "--gain", &claimed, &error, &gain);
+		argument_option(i, argc, argv, "", "--kdm", &claimed, &error, &kdm, string_to_path);
+		argument_option(i, argc, argv, "", "--cpl", &claimed, &error, &cpl);
 
 		if (!claimed) {
 			if (a.length() > 2 && a.substr(0, 2) == "--") {
@@ -214,6 +224,8 @@ CreateCLI::CreateCLI (int argc, char* argv[])
 				c.frame_type = next_frame_type;
 				c.channel = channel;
 				c.gain = gain;
+				c.kdm = kdm;
+				c.cpl = cpl;
 				content.push_back (c);
 				next_frame_type = VideoFrameType::TWO_D;
 				channel = {};