Give an error if a non-number is passed to dcpomatic2_create -s (#2488).

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

diff --git a/src/lib/create_cli.cc b/src/lib/create_cli.cc
index a6e13c8bc04a26ed0df26aaabf0c2f9b8b72c4f0..81e35389383383c870ef1cc529a05425f15a7b41 100644 (file)
--- a/src/lib/create_cli.cc
+++ b/src/lib/create_cli.cc
@@ -55,7 +55,7 @@ string CreateCLI::_help =
        "      --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"
+       "      --channel <channel>       next piece of content should be mapped to audio channel L, R, C, Lfe, Ls, Rs, BsL, BsR, HI, VI\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";
@@ -123,7 +123,6 @@ CreateCLI::CreateCLI (int argc, char* argv[])
        , threed (false)
        , dcp_content_type (nullptr)
        , container_ratio (nullptr)
-       , still_length (10)
        , standard (dcp::Standard::SMPTE)
        , no_use_isdcf_name (false)
        , twok (false)
@@ -176,16 +175,28 @@ CreateCLI::CreateCLI (int argc, char* argv[])
                        claimed = true;
                }
 
+               std::function<optional<string> (string s)> string_to_string = [](string s) {
+                       return s;
+               };
+
                std::function<optional<boost::filesystem::path> (string s)> string_to_path = [](string s) {
                        return boost::filesystem::path(s);
                };
 
+               std::function<optional<int> (string s)> string_to_nonzero_int = [](string s) {
+                       auto const value = dcp::raw_convert<int>(s);
+                       if (value == 0) {
+                               return boost::optional<int>();
+                       }
+                       return boost::optional<int>(value);
+               };
+
                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);
                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);
+               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);
                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);
@@ -204,6 +215,14 @@ CreateCLI::CreateCLI (int argc, char* argv[])
                                return dcp::Channel::LS;
                        } else if (channel == "Rs") {
                                return dcp::Channel::RS;
+                       } else if (channel == "BsL") {
+                               return dcp::Channel::BSL;
+                       } else if (channel == "BsR") {
+                               return dcp::Channel::BSR;
+                       } else if (channel == "HI") {
+                               return dcp::Channel::HI;
+                       } else if (channel == "VI") {
+                               return dcp::Channel::VI;
                        } else {
                                return {};
                        }
@@ -212,7 +231,10 @@ 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);
+               /* It shouldn't be necessary to use this string_to_string here, but using the other argument_option()
+                * causes an odd compile error on Ubuntu 18.04.
+                */
+               argument_option(i, argc, argv, "", "--cpl", &claimed, &error, &cpl, string_to_string);
 
                if (!claimed) {
                        if (a.length() > 2 && a.substr(0, 2) == "--") {