c++11 tidying.

3 files changed, 24 insertions, 21 deletions

diff --git a/test/4k_test.cc b/test/4k_test.cc
index e09aeeb5c..6c6dea827 100644
--- a/test/4k_test.cc
+++ b/test/4k_test.cc
@@ -37,13 +37,14 @@
 #include "test.h"
 
 using std::shared_ptr;
+using std::make_shared;
 
 BOOST_AUTO_TEST_CASE (fourk_test)
 {
-	shared_ptr<Film> film = new_test_film ("4k_test");
+	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"));
+	auto c = make_shared<FFmpegContent>("test/data/test.mp4");
 	film->set_resolution (RESOLUTION_4K);
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
 	film->set_container (Ratio::from_id ("185"));
diff --git a/test/burnt_subtitle_test.cc b/test/burnt_subtitle_test.cc
index 4a056dbf7..edad2c674 100644
--- a/test/burnt_subtitle_test.cc
+++ b/test/burnt_subtitle_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -51,16 +51,17 @@ using std::cout;
 using std::map;
 using std::shared_ptr;
 using std::dynamic_pointer_cast;
+using std::make_shared;
 using namespace dcpomatic;
 
 /** Build a small DCP with no picture and a single subtitle overlaid onto it from a SubRip file */
 BOOST_AUTO_TEST_CASE (burnt_subtitle_test_subrip)
 {
-	shared_ptr<Film> film = new_test_film ("burnt_subtitle_test_subrip");
+	auto film = new_test_film ("burnt_subtitle_test_subrip");
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	film->set_name ("frobozz");
-	shared_ptr<StringText> content (new StringText (film, "test/data/subrip2.srt"));
+	auto content = make_shared<StringText>(film, "test/data/subrip2.srt");
 	content->subtitle->set_use (true);
 	content->subtitle->set_burn (true);
 	film->examine_and_add_content (content);
@@ -74,11 +75,11 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_subrip)
 /** Build a small DCP with no picture and a single subtitle overlaid onto it from a DCP XML file */
 BOOST_AUTO_TEST_CASE (burnt_subtitle_test_dcp)
 {
-	shared_ptr<Film> film = new_test_film ("burnt_subtitle_test_dcp");
+	auto film = new_test_film ("burnt_subtitle_test_dcp");
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	film->set_name ("frobozz");
-	shared_ptr<DCPTextContent> content (new DCPTextContent (film, "test/data/dcp_sub.xml"));
+	auto content = make_shared<DCPTextContent>(film, "test/data/dcp_sub.xml");
 	content->subtitle->set_use (true);
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs());
@@ -91,7 +92,7 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_dcp)
 /** Burn some subtitles into an existing DCP to check the colour conversion */
 BOOST_AUTO_TEST_CASE (burnt_subtitle_test_onto_dcp)
 {
-	shared_ptr<Film> film = new_test_film ("burnt_subtitle_test_onto_dcp");
+	auto film = new_test_film ("burnt_subtitle_test_onto_dcp");
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	film->set_name ("frobozz");
@@ -101,13 +102,13 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_onto_dcp)
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	Config::instance()->set_log_types (Config::instance()->log_types() | LogEntry::TYPE_DEBUG_ENCODE);
-	shared_ptr<Film> film2 = new_test_film ("burnt_subtitle_test_onto_dcp2");
+	auto film2 = new_test_film ("burnt_subtitle_test_onto_dcp2");
 	film2->set_container (Ratio::from_id ("185"));
 	film2->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	film2->set_name ("frobozz");
-	shared_ptr<DCPContent> background_dcp (new DCPContent(film2, film->dir(film->dcp_name())));
+	auto background_dcp = make_shared<DCPContent>(film2, film->dir(film->dcp_name()));
 	film2->examine_and_add_content (background_dcp);
-	shared_ptr<StringText> sub = dynamic_pointer_cast<StringText> (
+	auto sub = dynamic_pointer_cast<StringText> (
 		content_factory(film2, "test/data/subrip2.srt").front()
 		);
 	sub->subtitle->set_burn (true);
@@ -126,12 +127,12 @@ BOOST_AUTO_TEST_CASE (burnt_subtitle_test_onto_dcp)
 	BOOST_REQUIRE_EQUAL (dcp.cpls().front()->reels().size(), 1);
 	BOOST_REQUIRE (dcp.cpls().front()->reels().front()->main_picture());
 	BOOST_REQUIRE (dcp.cpls().front()->reels().front()->main_picture()->asset());
-	shared_ptr<const dcp::MonoPictureAsset> pic = dynamic_pointer_cast<dcp::ReelMonoPictureAsset> (
+	auto pic = dynamic_pointer_cast<dcp::ReelMonoPictureAsset> (
 		dcp.cpls().front()->reels().front()->main_picture()
 		)->mono_asset();
 	BOOST_REQUIRE (pic);
-	shared_ptr<const dcp::MonoPictureFrame> frame = pic->start_read()->get_frame (12);
-	shared_ptr<dcp::OpenJPEGImage> xyz = frame->xyz_image ();
+	auto frame = pic->start_read()->get_frame(12);
+	auto xyz = frame->xyz_image ();
 	BOOST_CHECK_EQUAL (xyz->size().width, 1998);
 	BOOST_CHECK_EQUAL (xyz->size().height, 1080);
 
diff --git a/test/silence_padding_test.cc b/test/silence_padding_test.cc
index e1d893ccb..11c5bd0d1 100644
--- a/test/silence_padding_test.cc
+++ b/test/silence_padding_test.cc
@@ -37,20 +37,21 @@
 #include <dcp/sound_asset_reader.h>
 #include <boost/test/unit_test.hpp>
 
+using std::make_shared;
 using std::string;
-using boost::lexical_cast;
 using std::shared_ptr;
+using boost::lexical_cast;
 
 static void
 test_silence_padding (int channels)
 {
 	string const film_name = "silence_padding_test_" + lexical_cast<string> (channels);
-	shared_ptr<Film> film = new_test_film (film_name);
+	auto film = new_test_film (film_name);
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
 	film->set_container (Ratio::from_id ("185"));
 	film->set_name (film_name);
 
-	shared_ptr<FFmpegContent> content (new FFmpegContent("test/data/staircase.wav"));
+	auto content = make_shared<FFmpegContent>("test/data/staircase.wav");
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs());
 
@@ -64,7 +65,7 @@ test_silence_padding (int channels)
 	dcp::DCP check (path.string ());
 	check.read ();
 
-	shared_ptr<const dcp::ReelSoundAsset> sound_asset = check.cpls().front()->reels().front()->main_sound ();
+	auto sound_asset = check.cpls()[0]->reels()[0]->main_sound();
 	BOOST_CHECK (sound_asset);
 	BOOST_CHECK_EQUAL (sound_asset->asset()->channels (), channels);
 
@@ -74,7 +75,7 @@ test_silence_padding (int channels)
 	int frame = 0;
 
 	while (n < sound_asset->asset()->intrinsic_duration()) {
-		shared_ptr<const dcp::SoundFrame> sound_frame = sound_asset->asset()->start_read()->get_frame (frame++);
+		auto sound_frame = sound_asset->asset()->start_read()->get_frame(frame++);
 		uint8_t const * d = sound_frame->data ();
 
 		for (int i = 0; i < sound_frame->size(); i += (3 * sound_asset->asset()->channels())) {
@@ -135,8 +136,8 @@ BOOST_AUTO_TEST_CASE (silence_padding_test)
 
 BOOST_AUTO_TEST_CASE (silence_padding_test2)
 {
-	shared_ptr<Film> film = new_test_film2 ("silence_padding_test2");
-	shared_ptr<FFmpegContent> content (new FFmpegContent(TestPaths::private_data() / "cars.mov"));
+	auto film = new_test_film2 ("silence_padding_test2");
+	auto content = make_shared<FFmpegContent>(TestPaths::private_data() / "cars.mov");
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs());