More enum class additions.

1 files changed, 55 insertions, 54 deletions

diff --git a/test/reels_test.cc b/test/reels_test.cc
index cf8dc3e2e..402005339 100644
--- a/test/reels_test.cc
+++ b/test/reels_test.cc
@@ -41,28 +41,29 @@ using std::cout;
 using std::vector;
 using std::string;
 using std::shared_ptr;
+using std::make_shared;
 using boost::function;
 using namespace dcpomatic;
 
 /** Test Film::reels() */
 BOOST_AUTO_TEST_CASE (reels_test1)
 {
-	shared_ptr<Film> film = new_test_film ("reels_test1");
+	auto film = new_test_film ("reels_test1");
 	film->set_container (Ratio::from_id ("185"));
-	shared_ptr<FFmpegContent> A (new FFmpegContent("test/data/test.mp4"));
+	auto A = make_shared<FFmpegContent>("test/data/test.mp4");
 	film->examine_and_add_content (A);
-	shared_ptr<FFmpegContent> B (new FFmpegContent("test/data/test.mp4"));
+	auto B = make_shared<FFmpegContent>("test/data/test.mp4");
 	film->examine_and_add_content (B);
 	BOOST_REQUIRE (!wait_for_jobs());
 	BOOST_CHECK_EQUAL (A->full_length(film).get(), 288000);
 
-	film->set_reel_type (REELTYPE_SINGLE);
-	list<DCPTimePeriod> r = film->reels ();
+	film->set_reel_type (ReelType::SINGLE);
+	auto r = film->reels ();
 	BOOST_CHECK_EQUAL (r.size(), 1U);
 	BOOST_CHECK_EQUAL (r.front().from.get(), 0);
 	BOOST_CHECK_EQUAL (r.front().to.get(), 288000 * 2);
 
-	film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+	film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 	r = film->reels ();
 	BOOST_CHECK_EQUAL (r.size(), 2U);
 	BOOST_CHECK_EQUAL (r.front().from.get(), 0);
@@ -71,12 +72,12 @@ BOOST_AUTO_TEST_CASE (reels_test1)
 	BOOST_CHECK_EQUAL (r.back().to.get(), 288000 * 2);
 
 	film->set_j2k_bandwidth (100000000);
-	film->set_reel_type (REELTYPE_BY_LENGTH);
+	film->set_reel_type (ReelType::BY_LENGTH);
 	/* This is just over 2.5s at 100Mbit/s; should correspond to 60 frames */
 	film->set_reel_length (31253154);
 	r = film->reels ();
 	BOOST_CHECK_EQUAL (r.size(), 3U);
-	list<DCPTimePeriod>::const_iterator i = r.begin ();
+	auto i = r.begin ();
 	BOOST_CHECK_EQUAL (i->from.get(), 0);
 	BOOST_CHECK_EQUAL (i->to.get(), DCPTime::from_frames(60, 24).get());
 	++i;
@@ -92,7 +93,7 @@ BOOST_AUTO_TEST_CASE (reels_test1)
  */
 BOOST_AUTO_TEST_CASE (reels_test2)
 {
-	shared_ptr<Film> film = new_test_film ("reels_test2");
+	auto film = new_test_film ("reels_test2");
 	film->set_name ("reels_test2");
 	film->set_container (Ratio::from_id ("185"));
 	film->set_interop (false);
@@ -119,7 +120,7 @@ BOOST_AUTO_TEST_CASE (reels_test2)
 		c->video->set_length (24);
 	}
 
-	film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+	film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 	BOOST_CHECK_EQUAL (film->reels().size(), 3U);
 	BOOST_REQUIRE (!wait_for_jobs());
 
@@ -132,15 +133,15 @@ BOOST_AUTO_TEST_CASE (reels_test2)
 	film2->set_name ("reels_test2b");
 	film2->set_container (Ratio::from_id ("185"));
 	film2->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
-	film2->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+	film2->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 
-	shared_ptr<DCPContent> c (new DCPContent(film->dir(film->dcp_name())));
+	auto c = make_shared<DCPContent>(film->dir(film->dcp_name()));
 	film2->examine_and_add_content (c);
 	BOOST_REQUIRE (!wait_for_jobs ());
 
-	list<DCPTimePeriod> r = film2->reels ();
+	auto r = film2->reels ();
 	BOOST_CHECK_EQUAL (r.size(), 3U);
-	list<DCPTimePeriod>::const_iterator i = r.begin ();
+	auto i = r.begin ();
 	BOOST_CHECK_EQUAL (i->from.get(), 0);
 	BOOST_CHECK_EQUAL (i->to.get(), 96000);
 	++i;
@@ -157,26 +158,26 @@ BOOST_AUTO_TEST_CASE (reels_test2)
 	BOOST_REQUIRE (!wait_for_jobs());
 }
 
-/** Check that REELTYPE_BY_VIDEO_CONTENT adds an extra reel, if necessary, at the end
+/** Check that ReelType::BY_VIDEO_CONTENT adds an extra reel, if necessary, at the end
  *  of all the video content to mop up anything afterward.
  */
 BOOST_AUTO_TEST_CASE (reels_test3)
 {
-	shared_ptr<Film> film = new_test_film ("reels_test3");
+	auto film = new_test_film ("reels_test3");
 	film->set_name ("reels_test3");
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
-	film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+	film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 
-	shared_ptr<Content> dcp (new DCPContent("test/data/reels_test2"));
+	auto dcp = make_shared<DCPContent>("test/data/reels_test2");
 	film->examine_and_add_content (dcp);
-	shared_ptr<Content> sub (new StringTextFileContent("test/data/subrip.srt"));
+	auto sub = make_shared<StringTextFileContent>("test/data/subrip.srt");
 	film->examine_and_add_content (sub);
 	BOOST_REQUIRE (!wait_for_jobs());
 
-	list<DCPTimePeriod> reels = film->reels();
+	auto reels = film->reels();
 	BOOST_REQUIRE_EQUAL (reels.size(), 4U);
-	list<DCPTimePeriod>::const_iterator i = reels.begin ();
+	auto i = reels.begin ();
 	BOOST_CHECK_EQUAL (i->from.get(), 0);
 	BOOST_CHECK_EQUAL (i->to.get(), 96000);
 	++i;
@@ -195,11 +196,11 @@ BOOST_AUTO_TEST_CASE (reels_test3)
  */
 BOOST_AUTO_TEST_CASE (reels_test4)
 {
-	shared_ptr<Film> film = new_test_film ("reels_test4");
+	auto film = new_test_film ("reels_test4");
 	film->set_name ("reels_test4");
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
-	film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+	film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 	film->set_interop (false);
 
 	/* 4 piece of 1s-long content */
@@ -215,9 +216,9 @@ BOOST_AUTO_TEST_CASE (reels_test4)
 	film->examine_and_add_content (subs);
 	BOOST_REQUIRE (!wait_for_jobs());
 
-	list<DCPTimePeriod> reels = film->reels();
+	auto reels = film->reels();
 	BOOST_REQUIRE_EQUAL (reels.size(), 4U);
-	list<DCPTimePeriod>::const_iterator i = reels.begin ();
+	auto i = reels.begin ();
 	BOOST_CHECK_EQUAL (i->from.get(), 0);
 	BOOST_CHECK_EQUAL (i->to.get(), 96000);
 	++i;
@@ -238,7 +239,7 @@ BOOST_AUTO_TEST_CASE (reels_test4)
 
 BOOST_AUTO_TEST_CASE (reels_test5)
 {
-	shared_ptr<Film> film = new_test_film ("reels_test5");
+	auto film = new_test_film ("reels_test5");
 	film->set_sequence (false);
 	shared_ptr<DCPContent> dcp (new DCPContent("test/data/reels_test4"));
 	film->examine_and_add_content (dcp);
@@ -248,9 +249,9 @@ BOOST_AUTO_TEST_CASE (reels_test5)
 	dcp->set_position(film, DCPTime(2123));
 
 	{
-		list<DCPTimePeriod> p = dcp->reels (film);
+		auto p = dcp->reels (film);
 		BOOST_REQUIRE_EQUAL (p.size(), 4U);
-		list<DCPTimePeriod>::const_iterator i = p.begin();
+		auto i = p.begin();
 		BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 0), DCPTime(4000 + 96000)));
 		BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 96000), DCPTime(4000 + 192000)));
 		BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 192000), DCPTime(4000 + 288000)));
@@ -259,9 +260,9 @@ BOOST_AUTO_TEST_CASE (reels_test5)
 
 	{
 		dcp->set_trim_start (ContentTime::from_seconds (0.5));
-		list<DCPTimePeriod> p = dcp->reels (film);
+		auto p = dcp->reels (film);
 		BOOST_REQUIRE_EQUAL (p.size(), 4U);
-		list<DCPTimePeriod>::const_iterator i = p.begin();
+		auto i = p.begin();
 		BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 0), DCPTime(4000 + 48000)));
 		BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 48000), DCPTime(4000 + 144000)));
 		BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 144000), DCPTime(4000 + 240000)));
@@ -270,9 +271,9 @@ BOOST_AUTO_TEST_CASE (reels_test5)
 
 	{
 		dcp->set_trim_end (ContentTime::from_seconds (0.5));
-		list<DCPTimePeriod> p = dcp->reels (film);
+		auto p = dcp->reels (film);
 		BOOST_REQUIRE_EQUAL (p.size(), 4U);
-		list<DCPTimePeriod>::const_iterator i = p.begin();
+		auto i = p.begin();
 		BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 0), DCPTime(4000 + 48000)));
 		BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 48000), DCPTime(4000 + 144000)));
 		BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 144000), DCPTime(4000 + 240000)));
@@ -281,9 +282,9 @@ BOOST_AUTO_TEST_CASE (reels_test5)
 
 	{
 		dcp->set_trim_start (ContentTime::from_seconds (1.5));
-		list<DCPTimePeriod> p = dcp->reels (film);
+		auto p = dcp->reels (film);
 		BOOST_REQUIRE_EQUAL (p.size(), 3U);
-		list<DCPTimePeriod>::const_iterator i = p.begin();
+		auto i = p.begin();
 		BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 0), DCPTime(4000 + 48000)));
 		BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 48000), DCPTime(4000 + 144000)));
 		BOOST_CHECK (*i++ == DCPTimePeriod (DCPTime(4000 + 144000), DCPTime(4000 + 192000)));
@@ -293,7 +294,7 @@ BOOST_AUTO_TEST_CASE (reels_test5)
 /** Check reel split with a muxed video/audio source */
 BOOST_AUTO_TEST_CASE (reels_test6)
 {
-	shared_ptr<Film> film = new_test_film ("reels_test6");
+	auto film = new_test_film ("reels_test6");
 	film->set_name ("reels_test6");
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
@@ -302,7 +303,7 @@ BOOST_AUTO_TEST_CASE (reels_test6)
 	BOOST_REQUIRE (!wait_for_jobs ());
 
 	film->set_j2k_bandwidth (100000000);
-	film->set_reel_type (REELTYPE_BY_LENGTH);
+	film->set_reel_type (ReelType::BY_LENGTH);
 	/* This is just over 2.5s at 100Mbit/s; should correspond to 60 frames */
 	film->set_reel_length (31253154);
 	film->make_dcp ();
@@ -310,24 +311,24 @@ BOOST_AUTO_TEST_CASE (reels_test6)
 }
 
 /** Check the case where the last bit of audio hangs over the end of the video
- *  and we are using REELTYPE_BY_VIDEO_CONTENT.
+ *  and we are using ReelType::BY_VIDEO_CONTENT.
  */
 BOOST_AUTO_TEST_CASE (reels_test7)
 {
-	shared_ptr<Film> film = new_test_film ("reels_test7");
+	auto film = new_test_film ("reels_test7");
 	film->set_name ("reels_test7");
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
-	shared_ptr<Content> A = content_factory("test/data/flat_red.png").front();
+	auto A = content_factory("test/data/flat_red.png").front();
 	film->examine_and_add_content (A);
 	BOOST_REQUIRE (!wait_for_jobs ());
-	shared_ptr<Content> B = content_factory("test/data/awkward_length.wav").front();
+	auto B = content_factory("test/data/awkward_length.wav").front();
 	film->examine_and_add_content (B);
 	BOOST_REQUIRE (!wait_for_jobs ());
 	film->set_video_frame_rate (24);
 	A->video->set_length (2 * 24);
 
-	film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+	film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 	BOOST_REQUIRE_EQUAL (film->reels().size(), 2U);
 	BOOST_CHECK (film->reels().front() == DCPTimePeriod(DCPTime(0), DCPTime::from_frames(2 * 24, 24)));
 	BOOST_CHECK (film->reels().back() == DCPTimePeriod(DCPTime::from_frames(2 * 24, 24), DCPTime::from_frames(3 * 24 + 1, 24)));
@@ -343,7 +344,7 @@ BOOST_AUTO_TEST_CASE (reels_test8)
 	film->set_name ("reels_test8");
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TST"));
-	shared_ptr<FFmpegContent> A (new FFmpegContent("test/data/test2.mp4"));
+	auto A = make_shared<FFmpegContent>("test/data/test2.mp4");
 	film->examine_and_add_content (A);
 	BOOST_REQUIRE (!wait_for_jobs ());
 
@@ -371,7 +372,7 @@ BOOST_AUTO_TEST_CASE (reels_test9)
 	B->set_reference_video(true);
 	B->set_reference_audio(true);
 	BOOST_REQUIRE(!wait_for_jobs());
-	film2->set_reel_type(REELTYPE_BY_VIDEO_CONTENT);
+	film2->set_reel_type(ReelType::BY_VIDEO_CONTENT);
 	film2->write_metadata();
 	film2->make_dcp();
 	BOOST_REQUIRE(!wait_for_jobs());
@@ -397,7 +398,7 @@ BOOST_AUTO_TEST_CASE (reels_test10)
 	BOOST_REQUIRE (!wait_for_jobs());
 	B->video->set_length (5 * 24);
 
-	ov->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+	ov->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 	ov->make_dcp ();
 	BOOST_REQUIRE (!wait_for_jobs());
 	ov->write_metadata ();
@@ -407,7 +408,7 @@ BOOST_AUTO_TEST_CASE (reels_test10)
 	shared_ptr<DCPContent> ov_dcp(new DCPContent(ov->dir(ov->dcp_name())));
 	vf->examine_and_add_content (ov_dcp);
 	BOOST_REQUIRE (!wait_for_jobs());
-	vf->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+	vf->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 	ov_dcp->set_reference_video (true);
 	ov_dcp->set_reference_audio (true);
 	vf->examine_and_add_content (content_factory("test/data/15s.srt").front());
@@ -418,7 +419,7 @@ BOOST_AUTO_TEST_CASE (reels_test10)
 	vf->write_metadata ();
 }
 
-/** Another reels error; REELTYPE_BY_VIDEO_CONTENT when the first content is not
+/** Another reels error; ReelType::BY_VIDEO_CONTENT when the first content is not
  *  at time 0.
  */
 BOOST_AUTO_TEST_CASE (reels_test11)
@@ -431,7 +432,7 @@ BOOST_AUTO_TEST_CASE (reels_test11)
 	A->video->set_length (240);
 	A->set_video_frame_rate (24);
 	A->set_position (film, DCPTime::from_seconds(1));
-	film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+	film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 	film->make_dcp ();
 	BOOST_REQUIRE (!wait_for_jobs());
 	BOOST_CHECK_EQUAL (A->position().get(), DCPTime::from_seconds(1).get());
@@ -452,7 +453,7 @@ BOOST_AUTO_TEST_CASE (reels_test12)
 {
 	shared_ptr<Film> film = new_test_film2 ("reels_test12");
 	film->set_video_frame_rate (24);
-	film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+	film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 	film->set_sequence (false);
 
 	shared_ptr<FFmpegContent> A(new FFmpegContent("test/data/flat_red.png"));
@@ -531,13 +532,13 @@ BOOST_AUTO_TEST_CASE (reels_should_not_be_short1)
 }
 
 /** Leaving less than 1 second's gap between two pieces of content with
- *  REELTYPE_BY_VIDEO_CONTENT should not make a <1s reel.
+ *  ReelType::BY_VIDEO_CONTENT should not make a <1s reel.
  */
 BOOST_AUTO_TEST_CASE (reels_should_not_be_short2)
 {
 	shared_ptr<Film> film = new_test_film2 ("reels_should_not_be_short2");
 	film->set_video_frame_rate (24);
-	film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+	film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 
 	shared_ptr<FFmpegContent> A(new FFmpegContent("test/data/flat_red.png"));
 	film->examine_and_add_content (A);
@@ -560,14 +561,14 @@ BOOST_AUTO_TEST_CASE (reels_should_not_be_short2)
 	BOOST_REQUIRE (notes.empty());
 }
 
-/** Setting REELTYPE_BY_LENGTH and using a small length value should not make
+/** Setting ReelType::BY_LENGTH and using a small length value should not make
  *  <1s reels.
  */
 BOOST_AUTO_TEST_CASE (reels_should_not_be_short3)
 {
 	shared_ptr<Film> film = new_test_film2 ("reels_should_not_be_short3");
 	film->set_video_frame_rate (24);
-	film->set_reel_type (REELTYPE_BY_LENGTH);
+	film->set_reel_type (ReelType::BY_LENGTH);
 	film->set_reel_length (1024 * 1024 * 10);
 
 	shared_ptr<FFmpegContent> A(new FFmpegContent("test/data/flat_red.png"));
@@ -584,14 +585,14 @@ BOOST_AUTO_TEST_CASE (reels_should_not_be_short3)
 	BOOST_REQUIRE (notes.empty());
 }
 
-/** Having one piece of content less than 1s long in REELTYPE_BY_VIDEO_CONTENT
+/** Having one piece of content less than 1s long in ReelType::BY_VIDEO_CONTENT
  *  should not make a reel less than 1s long.
  */
 BOOST_AUTO_TEST_CASE (reels_should_not_be_short4)
 {
 	shared_ptr<Film> film = new_test_film2 ("reels_should_not_be_short4");
 	film->set_video_frame_rate (24);
-	film->set_reel_type (REELTYPE_BY_VIDEO_CONTENT);
+	film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 
 	shared_ptr<FFmpegContent> A(new FFmpegContent("test/data/flat_red.png"));
 	film->examine_and_add_content (A);