X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Frequired_disk_space_test.cc;h=cad2e2ee5bdffbaac3a4ab826ebfc5bdd21989cf;hb=0c846af54055b9915c6c68617cd28176d5f84351;hp=a4be8b9b70376e433b76b83868a871ab9c330d7c;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git

diff --git a/test/required_disk_space_test.cc b/test/required_disk_space_test.cc
index a4be8b9b7..cad2e2ee5 100644
--- a/test/required_disk_space_test.cc
+++ b/test/required_disk_space_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,19 +18,24 @@
 
 */
 
+
 /** @file  test/required_disk_space_test.cc
  *  @brief Check Film::required_disk_space
  *  @ingroup selfcontained
  */
 
+
 #include "lib/content_factory.h"
-#include "lib/film.h"
 #include "lib/dcp_content.h"
+#include "lib/film.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 
-using std::shared_ptr;
+
 using std::dynamic_pointer_cast;
+using std::make_shared;
+using std::shared_ptr;
+
 
 void check_within_n (int64_t a, int64_t b, int64_t n)
 {
@@ -40,14 +45,14 @@ void check_within_n (int64_t a, int64_t b, int64_t n)
 
 BOOST_AUTO_TEST_CASE (required_disk_space_test)
 {
-	shared_ptr<Film> film = new_test_film ("required_disk_space_test");
+	auto film = new_test_film ("required_disk_space_test");
 	film->set_j2k_bandwidth (100000000);
 	film->set_audio_channels (6);
-	film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
-	shared_ptr<Content> content_a = content_factory("test/data/flat_blue.png").front();
+	film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
+	auto content_a = content_factory("test/data/flat_blue.png").front();
 	BOOST_REQUIRE (content_a);
 	film->examine_and_add_content (content_a);
-	shared_ptr<DCPContent> content_b (new DCPContent("test/data/burnt_subtitle_test_dcp"));
+	auto content_b = make_shared<DCPContent>("test/data/burnt_subtitle_test_dcp");
 	film->examine_and_add_content (content_b);
 	BOOST_REQUIRE (!wait_for_jobs());
 	film->write_metadata ();