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) {
argument_option(i, argc, argv, "-n", "--name", &claimed, &error, &_name);
argument_option(i, argc, argv, "-t", "--template", &claimed, &error, &template_name_string);
- argument_option(i, argc, argv, "-c", "--dcp-content-type", &claimed, &error, &dcp_content_type_string);
+ /* See comment below about --cpl */
+ argument_option(i, argc, argv, "-c", "--dcp-content-type", &claimed, &error, &dcp_content_type_string, string_to_string);
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);
}
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())) {
channels = std::max(channels, static_cast<int>(*cli_content.channel) + 1);
}
}
- if (channels % 1) {
+ if (channels % 2) {
++channels;
}