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 b0f7a843ebf4a3d2b9fa05274a0fa32755a8493f..1c2f2c6354fcf3ef4f2edf73096c9add9af39c22 100644 (file)
--- a/src/lib/create_cli.cc
+++ b/src/lib/create_cli.cc
@@ -127,9 +127,9 @@ argument_option (
 CreateCLI::CreateCLI (int argc, char* argv[])
        : version (false)
 {
-       string dcp_content_type_string = "TST";
+       optional<string> dcp_content_type_string;
        string container_ratio_string;
-       string standard_string = "SMPTE";
+       optional<string> standard_string;
        int dcp_frame_rate_int = 0;
        string template_name_string;
        int j2k_bandwidth_int = 0;
@@ -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);
@@ -273,10 +275,12 @@ CreateCLI::CreateCLI (int argc, char* argv[])
                _j2k_bandwidth = j2k_bandwidth_int * 1000000;
        }
 
-       _dcp_content_type = DCPContentType::from_isdcf_name(dcp_content_type_string);
-       if (!_dcp_content_type) {
-               error = String::compose("%1: unrecognised DCP content type '%2'", argv[0], dcp_content_type_string);
-               return;
+       if (dcp_content_type_string) {
+               _dcp_content_type = DCPContentType::from_isdcf_name(*dcp_content_type_string);
+               if (!_dcp_content_type) {
+                       error = String::compose("%1: unrecognised DCP content type '%2'", argv[0], *dcp_content_type_string);
+                       return;
+               }
        }
 
        if (!container_ratio_string.empty()) {
@@ -287,13 +291,15 @@ CreateCLI::CreateCLI (int argc, char* argv[])
                }
        }
 
-       if (standard_string != "SMPTE" && standard_string != "interop") {
-               error = String::compose("%1: standard must be SMPTE or interop", argv[0]);
-               return;
-       }
-
-       if (standard_string == "interop") {
-               _standard = dcp::Standard::INTEROP;
+       if (standard_string) {
+               if (*standard_string == "interop") {
+                       _standard = dcp::Standard::INTEROP;
+               } else if (*standard_string == "SMPTE") {
+                       _standard = dcp::Standard::SMPTE;
+               } else {
+                       error = String::compose("%1: standard must be SMPTE or interop", argv[0]);
+                       return;
+               }
        }
 
        if (_twod && _threed) {
@@ -310,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())) {
@@ -328,14 +334,26 @@ CreateCLI::make_film() const
        dcpomatic_log->set_types(Config::instance()->log_types());
        if (_template_name) {
                film->use_template(_template_name.get());
+       } else {
+               /* No template: apply our own CLI tool defaults to override the ones in Config.
+                * Maybe one day there will be no defaults in Config any more (as they'll be in
+                * a default template) and we can decide whether to use the default template
+                * or not.
+                */
+               film->set_interop(false);
+               film->set_dcp_content_type(DCPContentType::from_isdcf_name("TST"));
        }
        film->set_name(_name);
 
        if (_container_ratio) {
                film->set_container(_container_ratio);
        }
-       film->set_dcp_content_type(_dcp_content_type);
-       film->set_interop(_standard == dcp::Standard::INTEROP);
+       if (_dcp_content_type) {
+               film->set_dcp_content_type(_dcp_content_type);
+       }
+       if (_standard) {
+               film->set_interop(*_standard == dcp::Standard::INTEROP);
+       }
        film->set_use_isdcf_name(!_no_use_isdcf_name);
        if (_no_encrypt) {
                film->set_encrypted(false);
@@ -363,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;
        }