Fix checking of frame channels vs stream channels.

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

diff --git a/src/lib/create_cli.cc b/src/lib/create_cli.cc
index 26f3dbcae0b80b2ba9cc7235658590fd1eb857c8..107311d59ca01130d0c67ab9a85433f5f6bcb216 100644 (file)
--- a/src/lib/create_cli.cc
+++ b/src/lib/create_cli.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2019-2021 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2019-2022 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -47,7 +47,6 @@ string CreateCLI::_help =
        "  -s, --still-length <n>        number of seconds that still content should last\n"
        "      --standard <standard>     SMPTE or interop (default SMPTE)\n"
        "      --no-use-isdcf-name       do not use an ISDCF name; use the specified name unmodified\n"
-       "      --no-sign                 do not sign the DCP\n"
        "      --config <dir>            directory containing config.xml and cinemas.xml\n"
        "      --twok                    make a 2K DCP instead of choosing a resolution based on the content\n"
        "      --fourk                   make a 4K DCP instead of choosing a resolution based on the content\n"
@@ -57,7 +56,9 @@ string CreateCLI::_help =
        "      --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"
-       "      --gain                    next piece of content should have the given audio gain (in dB)\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";
 
 
 template <class T>
@@ -137,6 +138,8 @@ CreateCLI::CreateCLI (int argc, char* argv[])
        auto next_frame_type = VideoFrameType::TWO_D;
        optional<dcp::Channel> channel;
        optional<float> gain;
+       optional<boost::filesystem::path> kdm;
+       optional<std::string> cpl;
 
        int i = 1;
        while (i < argc) {
@@ -173,6 +176,10 @@ 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);
                };
@@ -208,6 +215,11 @@ 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);
+               /* 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) == "--") {
@@ -219,6 +231,8 @@ CreateCLI::CreateCLI (int argc, char* argv[])
                                c.frame_type = next_frame_type;
                                c.channel = channel;
                                c.gain = gain;
+                               c.kdm = kdm;
+                               c.cpl = cpl;
                                content.push_back (c);
                                next_frame_type = VideoFrameType::TWO_D;
                                channel = {};