C++11 tidying.

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

diff --git a/src/lib/create_cli.cc b/src/lib/create_cli.cc
index b670282b4717a0bfcbc3988b391a55cd1f5d1bcb..2258f8a2ea0ab6c439214309813c8a2a33ca5218 100644 (file)
--- a/src/lib/create_cli.cc
+++ b/src/lib/create_cli.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2019-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,20 +18,22 @@
 
 */
 
+
+#include "compose.hpp"
+#include "config.h"
 #include "create_cli.h"
 #include "dcp_content_type.h"
 #include "ratio.h"
-#include "config.h"
-#include "compose.hpp"
 #include <dcp/raw_convert.h>
+#include <iostream>
 #include <string>
 
-#include <iostream>
 
 using std::string;
 using std::cout;
 using boost::optional;
 
+
 string CreateCLI::_help =
        "\nSyntax: %1 [OPTION] <CONTENT> [OPTION] [<CONTENT> ...]\n"
        "  -v, --version                 show DCP-o-matic version\n"
@@ -54,6 +56,7 @@ 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";
 
+
 template <class T>
 void
 argument_option (int& n, int argc, char* argv[], string short_name, string long_name, bool* claimed, optional<string>* error, T* out)
@@ -72,6 +75,7 @@ argument_option (int& n, int argc, char* argv[], string short_name, string long_
        *claimed = true;
 }
 
+
 CreateCLI::CreateCLI (int argc, char* argv[])
        : version (false)
        , encrypt (false)
@@ -79,9 +83,8 @@ CreateCLI::CreateCLI (int argc, char* argv[])
        , dcp_content_type (0)
        , container_ratio (0)
        , still_length (10)
-       , standard (dcp::SMPTE)
+       , standard (dcp::Standard::SMPTE)
        , no_use_isdcf_name (false)
-       , no_sign (false)
        , fourk (false)
 {
        string dcp_content_type_string = "TST";
@@ -92,7 +95,7 @@ CreateCLI::CreateCLI (int argc, char* argv[])
        string config_dir_string;
        string output_dir_string;
        int j2k_bandwidth_int = 0;
-       VideoFrameType next_frame_type = VIDEO_FRAME_TYPE_2D;
+       auto next_frame_type = VideoFrameType::TWO_D;
 
        int i = 1;
        while (i < argc) {
@@ -113,15 +116,13 @@ CreateCLI::CreateCLI (int argc, char* argv[])
                        encrypt = claimed = true;
                } else if (a == "--no-use-isdcf-name") {
                        no_use_isdcf_name = claimed = true;
-               } else if (a == "--no-sign") {
-                       no_sign = claimed = true;
                } else if (a == "--threed") {
                        threed = claimed = true;
                } else if (a == "--left-eye") {
-                       next_frame_type = VIDEO_FRAME_TYPE_3D_LEFT;
+                       next_frame_type = VideoFrameType::THREE_D_LEFT;
                        claimed = true;
                } else if (a == "--right-eye") {
-                       next_frame_type = VIDEO_FRAME_TYPE_3D_RIGHT;
+                       next_frame_type = VideoFrameType::THREE_D_RIGHT;
                        claimed = true;
                } else if (a == "--fourk") {
                        fourk = true;
@@ -148,7 +149,7 @@ CreateCLI::CreateCLI (int argc, char* argv[])
                                c.path = a;
                                c.frame_type = next_frame_type;
                                content.push_back (c);
-                               next_frame_type = VIDEO_FRAME_TYPE_2D;
+                               next_frame_type = VideoFrameType::TWO_D;
                        }
                }
 
@@ -194,6 +195,10 @@ CreateCLI::CreateCLI (int argc, char* argv[])
                return;
        }
 
+       if (standard_string == "interop") {
+               standard = dcp::Standard::INTEROP;
+       }
+
        if (content.empty()) {
                error = String::compose("%1: no content specified", argv[0]);
                return;