Use plain git hash for VERSION when there is no exact tag.

[dcpomatic.git] / src / lib / create_cli.cc

diff --git a/src/lib/create_cli.cc b/src/lib/create_cli.cc
index ed62abefb1d2fd695a20ce68446f9d0a4d782165..1c2f2c6354fcf3ef4f2edf73096c9add9af39c22 100644 (file)
--- 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) {
@@ -196,11 +196,13 @@ CreateCLI::CreateCLI (int argc, char* argv[])
 
                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);
@@ -314,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())) {
@@ -379,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;
        }