X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcreate_cli.cc;h=2258f8a2ea0ab6c439214309813c8a2a33ca5218;hb=6bf04a56980eca8688fc8b691ed4fc5bca4ae8d3;hp=de26a7412355919b1f97c6085f3a44b51f8e2a74;hpb=28111007e2e6fd62f5810be780706ae1618bd33f;p=dcpomatic.git

diff --git a/src/lib/create_cli.cc b/src/lib/create_cli.cc
index de26a7412..2258f8a2e 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,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)
@@ -91,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) {
@@ -115,10 +119,10 @@ 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;
@@ -145,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;
 			}
 		}