X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2F4k_test.cc;h=38b43e9cdbd2bc1f47fc591aee8eb2e12626f238;hb=acfbd1c01020ea95d9e7eb3d63ddb14b9407732a;hp=71d60f5732e10106a721b02ebf016b1cc9d8612f;hpb=6cc7359c1af897f334dab5ba455707ce0c59af9d;p=dcpomatic.git

diff --git a/test/4k_test.cc b/test/4k_test.cc
index 71d60f573..38b43e9cd 100644
--- a/test/4k_test.cc
+++ b/test/4k_test.cc
@@ -18,7 +18,7 @@
 
 */
 
-/** @defgroup completedcp Complete builds of DCPs with various characteristics, testing broad areas of code */
+/** @defgroup completedcp Complete builds of DCPs */
 
 /** @file  test/4k_test.cc
  *  @brief Run a 4K encode from a simple input.
@@ -36,22 +36,21 @@
 #include "lib/dcpomatic_log.h"
 #include "test.h"
 
-using boost::shared_ptr;
+using std::shared_ptr;
+using std::make_shared;
 
 BOOST_AUTO_TEST_CASE (fourk_test)
 {
-	shared_ptr<Film> film = new_test_film ("4k_test");
-	dcpomatic_log = film->log ();
+	auto film = new_test_film ("4k_test");
+	LogSwitcher ls (film->log());
 	film->set_name ("4k_test");
-	shared_ptr<FFmpegContent> c (new FFmpegContent("test/data/test.mp4"));
-	film->set_resolution (RESOLUTION_4K);
+	auto c = make_shared<FFmpegContent>("test/data/test.mp4");
+	film->set_resolution (Resolution::FOUR_K);
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
 	film->set_container (Ratio::from_id ("185"));
 	film->examine_and_add_content (c);
 	BOOST_REQUIRE (!wait_for_jobs());
 
-	c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
-
 	film->make_dcp ();
 	BOOST_REQUIRE (!wait_for_jobs());