X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcreate_cli.cc;h=f80af758a92e1cf036a1e5c2270592ee320a94dd;hp=3a0c3361771a9b44fc739c9bd47b1bd0691567db;hb=HEAD;hpb=f12c261d58d78b9da1ef1a4757a93b63a309002a

diff --git a/src/lib/create_cli.cc b/src/lib/create_cli.cc
index 3a0c33617..1c2f2c635 100644
--- a/src/lib/create_cli.cc
+++ b/src/lib/create_cli.cc
@@ -137,7 +137,7 @@ CreateCLI::CreateCLI (int argc, char* argv[])
 	optional<dcp::Channel> channel;
 	optional<float> gain;
 	optional<boost::filesystem::path> kdm;
-	optional<std::string> cpl;
+	optional<string> cpl;
 
 	int i = 1;
 	while (i < argc) {
@@ -201,7 +201,8 @@ CreateCLI::CreateCLI (int argc, char* argv[])
 		argument_option(i, argc, argv, "-f", "--dcp-frame-rate",   &claimed, &error, &dcp_frame_rate_int);
 		argument_option(i, argc, argv, "",   "--container-ratio",  &claimed, &error, &container_ratio_string);
 		argument_option(i, argc, argv, "-s", "--still-length",     &claimed, &error, &still_length, string_to_nonzero_int);
-		argument_option(i, argc, argv, "",   "--standard",         &claimed, &error, &standard_string);
+		/* See comment below about --cpl */
+		argument_option(i, argc, argv, "",   "--standard",         &claimed, &error, &standard_string, string_to_string);
 		argument_option(i, argc, argv, "",   "--config",           &claimed, &error, &config_dir, string_to_path);
 		argument_option(i, argc, argv, "-o", "--output",           &claimed, &error, &output_dir, string_to_path);
 		argument_option(i, argc, argv, "",   "--j2k-bandwidth",    &claimed, &error, &j2k_bandwidth_int);
@@ -315,7 +316,7 @@ CreateCLI::CreateCLI (int argc, char* argv[])
 	}
 
 	if (_name.empty()) {
-		_name = content[0].path.leaf().string();
+		_name = content[0].path.filename().string();
 	}
 
 	if (_j2k_bandwidth && (*_j2k_bandwidth < 10000000 || *_j2k_bandwidth > Config::instance()->maximum_j2k_bandwidth())) {
@@ -380,7 +381,7 @@ CreateCLI::make_film() const
 			channels = std::max(channels, static_cast<int>(*cli_content.channel) + 1);
 		}
 	}
-	if (channels % 1) {
+	if (channels % 2) {
 		++channels;
 	}