X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcreate_cli.cc;h=8ea4e143f4efd381a46d1f5089698638c0d6f0c4;hb=7db6cf5d89b8e9e1f2eadfa93a16cb3ae12aae54;hp=de26a7412355919b1f97c6085f3a44b51f8e2a74;hpb=28111007e2e6fd62f5810be780706ae1618bd33f;p=dcpomatic.git

diff --git a/src/lib/create_cli.cc b/src/lib/create_cli.cc
index de26a7412..8ea4e143f 100644
--- 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,12 +75,42 @@ argument_option (int& n, int argc, char* argv[], string short_name, string long_
 	*claimed = true;
 }
 
+
+template <class T>
+void
+argument_option (
+	int& n,
+	int argc,
+	char* argv[],
+	string short_name,
+	string long_name,
+	bool* claimed,
+	optional<string>* error,
+	boost::optional<T>* out,
+	std::function<boost::optional<T> (string s)> convert = [](string s) { return dcp::raw_convert<T>(s); }
+	)
+{
+	string const a = argv[n];
+	if (a != short_name && a != long_name) {
+		return;
+	}
+
+	if ((n + 1) >= argc) {
+		**error = String::compose("%1: option %2 requires an argument", argv[0], long_name);
+		return;
+	}
+
+	*out = convert(argv[++n]);
+	*claimed = true;
+}
+
+
 CreateCLI::CreateCLI (int argc, char* argv[])
 	: version (false)
 	, encrypt (false)
 	, threed (false)
-	, dcp_content_type (0)
-	, container_ratio (0)
+	, dcp_content_type (nullptr)
+	, container_ratio (nullptr)
 	, still_length (10)
 	, standard (dcp::Standard::SMPTE)
 	, no_use_isdcf_name (false)
@@ -88,10 +121,8 @@ CreateCLI::CreateCLI (int argc, char* argv[])
 	string standard_string = "SMPTE";
 	int dcp_frame_rate_int = 0;
 	string template_name_string;
-	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) {
@@ -115,16 +146,20 @@ CreateCLI::CreateCLI (int argc, char* argv[])
 		} 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;
 			claimed = true;
 		}
 
+		std::function<optional<boost::filesystem::path> (string s)> string_to_path = [](string s) {
+			return boost::filesystem::path(s);
+		};
+
 		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);
@@ -132,8 +167,8 @@ CreateCLI::CreateCLI (int argc, char* argv[])
 		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, "",   "--standard",         &claimed, &error, &standard_string);
-		argument_option(i, argc, argv, "",   "--config",           &claimed, &error, &config_dir_string);
-		argument_option(i, argc, argv, "-o", "--output",           &claimed, &error, &output_dir_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);
 
 		if (!claimed) {
@@ -145,21 +180,13 @@ 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;
 			}
 		}
 
 		++i;
 	}
 
-	if (!config_dir_string.empty()) {
-		config_dir = config_dir_string;
-	}
-
-	if (!output_dir_string.empty()) {
-		output_dir = output_dir_string;
-	}
-
 	if (!template_name_string.empty()) {
 		template_name = template_name_string;
 	}