X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fcreate_cli_test.cc;h=97ac25374da8a135e3e6c7f38e46c099f93749f3;hb=b7a57184200d340bebcf81552aa1f05f220a8ec5;hp=747f0f0452444c3034268e3de90e2d52667499c5;hpb=b29eb5107c5e77fe01e43010e1582e733f6ceea1;p=dcpomatic.git

diff --git a/test/create_cli_test.cc b/test/create_cli_test.cc
index 747f0f045..97ac25374 100644
--- a/test/create_cli_test.cc
+++ b/test/create_cli_test.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.
 
@@ -21,6 +21,7 @@
 #include "lib/create_cli.h"
 #include "lib/ratio.h"
 #include "lib/dcp_content_type.h"
+#include "test.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/tokenizer.hpp>
 #include <boost/algorithm/string/predicate.hpp>
@@ -36,21 +37,19 @@ run (string cmd)
 	boost::escaped_list_separator<char> els ("", " ", "\"\'");
 	boost::tokenizer<boost::escaped_list_separator<char> > tok (cmd, els);
 
-	char** argv = new char*[256];
+	std::vector<char*> argv(256);
 	int argc = 0;
 
 	for (boost::tokenizer<boost::escaped_list_separator<char> >::iterator i = tok.begin(); i != tok.end(); ++i) {
 		argv[argc++] = strdup (i->c_str());
 	}
 
-	CreateCLI cc (argc, argv);
+	CreateCLI cc (argc, argv.data());
 
 	for (int i = 0; i < argc; ++i) {
 		free (argv[i]);
 	}
 
-	delete[] argv;
-
 	return cc;
 }
 
@@ -98,11 +97,11 @@ BOOST_AUTO_TEST_CASE (create_cli_test)
 
 	cc = run ("dcpomatic2_create x --standard SMPTE");
 	BOOST_CHECK (!cc.error);
-	BOOST_CHECK_EQUAL (cc.standard, dcp::SMPTE);
+	BOOST_CHECK_EQUAL (cc.standard, dcp::Standard::SMPTE);
 
 	cc = run ("dcpomatic2_create x --standard interop");
 	BOOST_CHECK (!cc.error);
-	BOOST_CHECK_EQUAL (cc.standard, dcp::INTEROP);
+	BOOST_CHECK_EQUAL (cc.standard, dcp::Standard::INTEROP);
 
 	cc = run ("dcpomatic2_create x --standard SMPTEX");
 	BOOST_CHECK (cc.error);
@@ -129,20 +128,26 @@ BOOST_AUTO_TEST_CASE (create_cli_test)
 	BOOST_CHECK_EQUAL (*cc.output_dir, "flaps");
 	BOOST_REQUIRE_EQUAL (cc.content.size(), 3U);
 	BOOST_CHECK_EQUAL (cc.content[0].path, "fred");
-	BOOST_CHECK_EQUAL (cc.content[0].frame_type, VIDEO_FRAME_TYPE_2D);
+	BOOST_CHECK_EQUAL (cc.content[0].frame_type, VideoFrameType::TWO_D);
 	BOOST_CHECK_EQUAL (cc.content[1].path, "jim");
-	BOOST_CHECK_EQUAL (cc.content[1].frame_type, VIDEO_FRAME_TYPE_2D);
+	BOOST_CHECK_EQUAL (cc.content[1].frame_type, VideoFrameType::TWO_D);
 	BOOST_CHECK_EQUAL (cc.content[2].path, "sheila");
-	BOOST_CHECK_EQUAL (cc.content[2].frame_type, VIDEO_FRAME_TYPE_2D);
+	BOOST_CHECK_EQUAL (cc.content[2].frame_type, VideoFrameType::TWO_D);
 
 	cc = run ("dcpomatic2_create --left-eye left.mp4 --right-eye right.mp4");
 	BOOST_REQUIRE_EQUAL (cc.content.size(), 2U);
 	BOOST_CHECK_EQUAL (cc.content[0].path, "left.mp4");
-	BOOST_CHECK_EQUAL (cc.content[0].frame_type, VIDEO_FRAME_TYPE_3D_LEFT);
+	BOOST_CHECK_EQUAL (cc.content[0].frame_type, VideoFrameType::THREE_D_LEFT);
 	BOOST_CHECK_EQUAL (cc.content[1].path, "right.mp4");
-	BOOST_CHECK_EQUAL (cc.content[1].frame_type, VIDEO_FRAME_TYPE_3D_RIGHT);
+	BOOST_CHECK_EQUAL (cc.content[1].frame_type, VideoFrameType::THREE_D_RIGHT);
 	BOOST_CHECK_EQUAL (cc.fourk, false);
 
+	cc = run ("dcpomatic2_create --twok foo.mp4");
+	BOOST_REQUIRE_EQUAL (cc.content.size(), 1U);
+	BOOST_CHECK_EQUAL (cc.content[0].path, "foo.mp4");
+	BOOST_CHECK_EQUAL (cc.twok, true);
+	BOOST_CHECK (!cc.error);
+
 	cc = run ("dcpomatic2_create --fourk foo.mp4");
 	BOOST_REQUIRE_EQUAL (cc.content.size(), 1U);
 	BOOST_CHECK_EQUAL (cc.content[0].path, "foo.mp4");
@@ -155,4 +160,28 @@ BOOST_AUTO_TEST_CASE (create_cli_test)
 	BOOST_REQUIRE (cc.j2k_bandwidth);
 	BOOST_CHECK_EQUAL (*cc.j2k_bandwidth, 120000000);
 	BOOST_CHECK (!cc.error);
+
+	cc = run ("dcpomatic2_create --channel L fred.wav --channel R jim.wav sheila.wav");
+	BOOST_REQUIRE_EQUAL (cc.content.size(), 3U);
+	BOOST_CHECK_EQUAL (cc.content[0].path, "fred.wav");
+	BOOST_CHECK (cc.content[0].channel);
+	BOOST_CHECK (*cc.content[0].channel == dcp::Channel::LEFT);
+	BOOST_CHECK_EQUAL (cc.content[1].path, "jim.wav");
+	BOOST_CHECK (cc.content[1].channel);
+	BOOST_CHECK (*cc.content[1].channel == dcp::Channel::RIGHT);
+	BOOST_CHECK_EQUAL (cc.content[2].path, "sheila.wav");
+	BOOST_CHECK (!cc.content[2].channel);
+
+	cc = run ("dcpomatic2_create --channel foo fred.wav");
+	BOOST_REQUIRE (cc.error);
+	BOOST_CHECK (boost::algorithm::starts_with(*cc.error, "dcpomatic2_create: foo is not valid for --channel"));
+
+	cc = run ("dcpomatic2_create fred.wav --gain -6 jim.wav --gain 2 sheila.wav");
+	BOOST_REQUIRE_EQUAL (cc.content.size(), 3U);
+	BOOST_CHECK_EQUAL (cc.content[0].path, "fred.wav");
+	BOOST_CHECK (!cc.content[0].gain);
+	BOOST_CHECK_EQUAL (cc.content[1].path, "jim.wav");
+	BOOST_CHECK_CLOSE (*cc.content[1].gain, -6, 0.001);
+	BOOST_CHECK_EQUAL (cc.content[2].path, "sheila.wav");
+	BOOST_CHECK_CLOSE (*cc.content[2].gain, 2, 0.001);
 }