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 2ca17f91b002ba4b8339c5afb2945a04a48f3165..107311d59ca01130d0c67ab9a85433f5f6bcb216 100644 (file)
--- a/src/lib/create_cli.cc
+++ b/src/lib/create_cli.cc
@@ -57,6 +57,7 @@ string CreateCLI::_help =
        "      --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"
+       "      --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";
 
 
@@ -138,6 +139,7 @@ CreateCLI::CreateCLI (int argc, char* argv[])
        optional<dcp::Channel> channel;
        optional<float> gain;
        optional<boost::filesystem::path> kdm;
+       optional<std::string> cpl;
 
        int i = 1;
        while (i < argc) {
@@ -174,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);
                };
@@ -210,6 +216,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);
+               /* 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) == "--") {
@@ -222,6 +232,7 @@ CreateCLI::CreateCLI (int argc, char* argv[])
                                c.channel = channel;
                                c.gain = gain;
                                c.kdm = kdm;
+                               c.cpl = cpl;
                                content.push_back (c);
                                next_frame_type = VideoFrameType::TWO_D;
                                channel = {};