X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fatmos_test.cc;h=661eca5b927b8058c762c899d8ddaf2a8d599938;hb=182b9d2e2feb6545592868606aaf0f0146095481;hp=c3e8c341c2917c0a064d7df3d73ab937bce8a50b;hpb=41262015eb2bb1fc3da8585883420975de381a65;p=dcpomatic.git

diff --git a/test/atmos_test.cc b/test/atmos_test.cc
index c3e8c341c..661eca5b9 100644
--- a/test/atmos_test.cc
+++ b/test/atmos_test.cc
@@ -26,7 +26,6 @@
 #include "lib/film.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
-#include <iostream>
 
 
 using std::string;
@@ -42,12 +41,11 @@ BOOST_AUTO_TEST_CASE (atmos_passthrough_test)
 
 	auto film = new_test_film2 (
 		"atmos_passthrough_test",
-		{ content_factory(TestPaths::private_data() / "atmos_asset.mxf").front() },
+		content_factory(TestPaths::private_data() / "atmos_asset.mxf"),
 		&cl
 		);
 
-	film->make_dcp ();
-	BOOST_REQUIRE (!wait_for_jobs());
+	make_and_verify_dcp (film, {dcp::VerificationNote::Code::MISSING_CPL_METADATA});
 
 	auto ref = TestPaths::private_data() / "atmos_asset.mxf";
 	BOOST_REQUIRE (mxf_atmos_files_same(ref, dcp_file(film, "atmos"), true));
@@ -61,8 +59,8 @@ BOOST_AUTO_TEST_CASE (atmos_encrypted_passthrough_test)
 	Cleanup cl;
 
 	auto ref = TestPaths::private_data() / "atmos_asset.mxf";
-	auto content = content_factory (TestPaths::private_data() / "atmos_asset.mxf").front();
-	auto film = new_test_film2 ("atmos_encrypted_passthrough_test", {content}, &cl);
+	auto content = content_factory(TestPaths::private_data() / "atmos_asset.mxf");
+	auto film = new_test_film2 ("atmos_encrypted_passthrough_test", content, &cl);
 
 	film->set_encrypted (true);
 	film->_key = dcp::Key ("4fac12927eb122af1c2781aa91f3a4cc");
@@ -91,3 +89,18 @@ BOOST_AUTO_TEST_CASE (atmos_encrypted_passthrough_test)
 	cl.run ();
 }
 
+
+BOOST_AUTO_TEST_CASE (atmos_trim_test)
+{
+	Cleanup cl;
+
+	auto ref = TestPaths::private_data() / "atmos_asset.mxf";
+	auto content = content_factory(TestPaths::private_data() / "atmos_asset.mxf");
+	auto film = new_test_film2 ("atmos_trim_test", content, &cl);
+
+	content[0]->set_trim_start (dcpomatic::ContentTime::from_seconds(1));
+
+	/* Just check that the encode runs; I'm not sure how to test the MXF */
+	make_and_verify_dcp (film, { dcp::VerificationNote::Code::MISSING_CPL_METADATA });
+}
+