Use BOOST_CHECK (not _EQUAL) so we can compare DCPTimes directly.

8 files changed, 104 insertions, 105 deletions

diff --git a/test/audio_analysis_test.cc b/test/audio_analysis_test.cc
index 2ae91a90f..00c09ff97 100644
--- a/test/audio_analysis_test.cc
+++ b/test/audio_analysis_test.cc
@@ -92,7 +92,7 @@ BOOST_AUTO_TEST_CASE (audio_analysis_serialisation_test)
 	BOOST_REQUIRE_EQUAL (b.sample_peak().size(), 3U);
 	for (int i = 0; i < channels; ++i) {
 		BOOST_CHECK_CLOSE (b.sample_peak()[i].peak, peak[i].peak, 1);
-		BOOST_CHECK_EQUAL (b.sample_peak()[i].time.get(), peak[i].time.get());
+		BOOST_CHECK(b.sample_peak()[i].time == peak[i].time);
 	}
 
 	BOOST_CHECK_EQUAL (a.samples_per_point(), 100);
diff --git a/test/audio_merger_test.cc b/test/audio_merger_test.cc
index b08d9c9f5..8bc000238 100644
--- a/test/audio_merger_test.cc
+++ b/test/audio_merger_test.cc
@@ -77,7 +77,7 @@ BOOST_AUTO_TEST_CASE(audio_merger_test1)
 	BOOST_REQUIRE(tb.size() == 1U);
 	BOOST_CHECK(tb.front().first != shared_ptr<const AudioBuffers>());
 	BOOST_CHECK_EQUAL(tb.front().first->frames(), 22);
-	BOOST_CHECK_EQUAL(tb.front().second.get(), 0);
+	BOOST_CHECK(tb.front().second == DCPTime());
 
 	/* And they should be a staircase */
 	for (int i = 0; i < 22; ++i) {
@@ -87,7 +87,7 @@ BOOST_AUTO_TEST_CASE(audio_merger_test1)
 	tb = merger.pull(DCPTime::from_frames(22 + 64, sampling_rate));
 	BOOST_REQUIRE(tb.size() == 1U);
 	BOOST_CHECK_EQUAL(tb.front().first->frames(), 64);
-	BOOST_CHECK_EQUAL(tb.front().second.get(), DCPTime::from_frames(22, sampling_rate).get());
+	BOOST_CHECK(tb.front().second == DCPTime::from_frames(22, sampling_rate));
 
 	/* Check the sample values */
 	for (int i = 0; i < 64; ++i) {
@@ -115,7 +115,7 @@ BOOST_AUTO_TEST_CASE(audio_merger_test2)
 	tb = merger.pull(DCPTime::from_frames(9 + 64, sampling_rate));
 
 	BOOST_CHECK_EQUAL(tb.front().first->frames(), 64);
-	BOOST_CHECK_EQUAL(tb.front().second.get(), DCPTime::from_frames(9, sampling_rate).get());
+	BOOST_CHECK(tb.front().second == DCPTime::from_frames(9, sampling_rate));
 
 	/* Check the sample values */
 	for (int i = 0; i < 64; ++i) {
@@ -137,7 +137,7 @@ BOOST_AUTO_TEST_CASE(audio_merger_test3)
 	auto tb = merger.pull(DCPTime::from_frames(100, sampling_rate));
 	BOOST_REQUIRE(tb.size() == 1U);
 	BOOST_CHECK_EQUAL(tb.front().first->frames(), 64);
-	BOOST_CHECK_EQUAL(tb.front().second.get(), DCPTime::from_frames(17, sampling_rate).get());
+	BOOST_CHECK(tb.front().second == DCPTime::from_frames(17, sampling_rate));
 	for (int i = 0; i < 64; ++i) {
 		BOOST_CHECK_EQUAL(tb.front().first->data()[0][i], i);
 	}
@@ -145,7 +145,7 @@ BOOST_AUTO_TEST_CASE(audio_merger_test3)
 	tb = merger.pull(DCPTime::from_frames(200, sampling_rate));
 	BOOST_REQUIRE(tb.size() == 1U);
 	BOOST_CHECK_EQUAL(tb.front().first->frames(), 64);
-	BOOST_CHECK_EQUAL(tb.front().second.get(), DCPTime::from_frames(114, sampling_rate).get());
+	BOOST_CHECK(tb.front().second == DCPTime::from_frames(114, sampling_rate));
 	for (int i = 0; i < 64; ++i) {
 		BOOST_CHECK_EQUAL(tb.front().first->data()[0][i], i);
 	}
diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc
index 3888a7b53..0386c3b46 100644
--- a/test/dcp_subtitle_test.cc
+++ b/test/dcp_subtitle_test.cc
@@ -80,7 +80,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test)
 	film->set_dcp_content_type(DCPContentType::from_isdcf_name("TLR"));
 	film->set_name("frobozz");
 
-	BOOST_CHECK_EQUAL (content->full_length(film).get(), DCPTime::from_seconds(2).get());
+	BOOST_CHECK(content->full_length(film) == DCPTime::from_seconds(2));
 
 	content->only_text()->set_use (true);
 	content->only_text()->set_burn (false);
diff --git a/test/ffmpeg_examiner_test.cc b/test/ffmpeg_examiner_test.cc
index c07900db8..822107d3c 100644
--- a/test/ffmpeg_examiner_test.cc
+++ b/test/ffmpeg_examiner_test.cc
@@ -45,9 +45,9 @@ BOOST_AUTO_TEST_CASE (ffmpeg_examiner_test)
 	auto film = new_test_film("ffmpeg_examiner_test", { content });
 	auto examiner = make_shared<FFmpegExaminer>(content);
 
-	BOOST_CHECK_EQUAL (examiner->first_video().get().get(), ContentTime::from_seconds(600).get());
+	BOOST_CHECK(examiner->first_video().get() == ContentTime::from_seconds(600));
 	BOOST_CHECK_EQUAL (examiner->audio_streams().size(), 1U);
-	BOOST_CHECK_EQUAL (examiner->audio_streams()[0]->first_audio.get().get(), ContentTime::from_seconds(600).get());
+	BOOST_CHECK(examiner->audio_streams()[0]->first_audio.get() == ContentTime::from_seconds(600));
 }
 
 
diff --git a/test/ffmpeg_pts_offset_test.cc b/test/ffmpeg_pts_offset_test.cc
index 642d85ff2..9b26aaab9 100644
--- a/test/ffmpeg_pts_offset_test.cc
+++ b/test/ffmpeg_pts_offset_test.cc
@@ -53,7 +53,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
 		content->_first_video = ContentTime ();
 		content->ffmpeg_audio_streams().front()->first_audio = ContentTime ();
 		FFmpegDecoder decoder (film, content, false);
-		BOOST_CHECK_EQUAL (decoder._pts_offset.get(), 0);
+		BOOST_CHECK(decoder._pts_offset == ContentTime());
 	}
 
 	{
@@ -61,7 +61,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
 		content->_first_video = ContentTime::from_seconds (600);
 		content->ffmpeg_audio_streams().front()->first_audio = ContentTime::from_seconds (600);
 		FFmpegDecoder decoder (film, content, false);
-		BOOST_CHECK_EQUAL (decoder._pts_offset.get(), ContentTime::from_seconds(-600).get());
+		BOOST_CHECK(decoder._pts_offset == ContentTime::from_seconds(-600));
 	}
 
 	{
@@ -69,7 +69,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
 		content->_first_video = ContentTime::from_frames (1, 24);
 		content->ffmpeg_audio_streams().front()->first_audio = ContentTime ();
 		FFmpegDecoder decoder (film, content, false);
-		BOOST_CHECK_EQUAL (decoder._pts_offset.get(), 0);
+		BOOST_CHECK(decoder._pts_offset == ContentTime());
 	}
 
 	{
diff --git a/test/player_test.cc b/test/player_test.cc
index 7fc21ac36..99c7a5b6a 100644
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -223,7 +223,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test)
 		auto t = DCPTime::from_frames (i, 24);
 		butler->seek (t, true);
 		auto video = butler->get_video(Butler::Behaviour::BLOCKING, 0);
-		BOOST_CHECK_EQUAL(video.second.get(), t.get());
+		BOOST_CHECK(video.second == t);
 		write_image(video.first->image(force(AV_PIX_FMT_RGB24), VideoRange::FULL, true), fmt::format("build/test/player_seek_test_{}.png", i));
 		/* This 14.08 is empirically chosen (hopefully) to accept changes in rendering between the reference and a test machine
 		   (17.10 and 16.04 seem to anti-alias a little differently) but to reject gross errors e.g. missing fonts or missing
@@ -258,7 +258,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test2)
 		auto t = DCPTime::from_seconds(5) + DCPTime::from_frames (i, 24);
 		butler->seek (t, true);
 		auto video = butler->get_video(Butler::Behaviour::BLOCKING, 0);
-		BOOST_CHECK_EQUAL(video.second.get(), t.get());
+		BOOST_CHECK(video.second == t);
 		write_image(
 			video.first->image(force(AV_PIX_FMT_RGB24), VideoRange::FULL, true), fmt::format("build/test/player_seek_test2_{}.png", i)
 			);
diff --git a/test/reels_test.cc b/test/reels_test.cc
index fcb1aee44..788745710 100644
--- a/test/reels_test.cc
+++ b/test/reels_test.cc
@@ -93,14 +93,14 @@ BOOST_AUTO_TEST_CASE (reels_test1)
 	r = film->reels ();
 	BOOST_CHECK_EQUAL (r.size(), 3U);
 	auto i = r.begin ();
-	BOOST_CHECK_EQUAL (i->from.get(), 0);
-	BOOST_CHECK_EQUAL (i->to.get(), DCPTime::from_frames(60, 24).get());
+	BOOST_CHECK(i->from == DCPTime());
+	BOOST_CHECK(i->to == DCPTime::from_frames(60, 24));
 	++i;
-	BOOST_CHECK_EQUAL (i->from.get(), DCPTime::from_frames(60, 24).get());
-	BOOST_CHECK_EQUAL (i->to.get(), DCPTime::from_frames(120, 24).get());
+	BOOST_CHECK(i->from == DCPTime::from_frames(60, 24));
+	BOOST_CHECK(i->to == DCPTime::from_frames(120, 24));
 	++i;
-	BOOST_CHECK_EQUAL (i->from.get(), DCPTime::from_frames(120, 24).get());
-	BOOST_CHECK_EQUAL (i->to.get(), DCPTime::from_frames(144, 24).get());
+	BOOST_CHECK(i->from == DCPTime::from_frames(120, 24));
+	BOOST_CHECK(i->to == DCPTime::from_frames(144, 24));
 }
 
 
@@ -135,14 +135,14 @@ BOOST_AUTO_TEST_CASE (reels_test2)
 	auto reels = film2->reels ();
 	BOOST_CHECK_EQUAL(reels.size(), 3U);
 	auto i = reels.begin();
-	BOOST_CHECK_EQUAL (i->from.get(), 0);
-	BOOST_CHECK_EQUAL (i->to.get(), 96000);
+	BOOST_CHECK(i->from == DCPTime::from_seconds(0));
+	BOOST_CHECK(i->to == DCPTime::from_seconds(1));
 	++i;
-	BOOST_CHECK_EQUAL (i->from.get(), 96000);
-	BOOST_CHECK_EQUAL (i->to.get(), 96000 * 2);
+	BOOST_CHECK(i->from == DCPTime::from_seconds(1));
+	BOOST_CHECK(i->to == DCPTime::from_seconds(2));
 	++i;
-	BOOST_CHECK_EQUAL (i->from.get(), 96000 * 2);
-	BOOST_CHECK_EQUAL (i->to.get(), 96000 * 3);
+	BOOST_CHECK(i->from == DCPTime::from_seconds(2));
+	BOOST_CHECK(i->to == DCPTime::from_seconds(3));
 
 	c->set_reference_video (true);
 	c->set_reference_audio (true);
@@ -164,17 +164,17 @@ BOOST_AUTO_TEST_CASE (reels_test3)
 	auto reels = film->reels();
 	BOOST_REQUIRE_EQUAL (reels.size(), 4U);
 	auto i = reels.begin ();
-	BOOST_CHECK_EQUAL (i->from.get(), 0);
-	BOOST_CHECK_EQUAL (i->to.get(), 96000);
+	BOOST_CHECK(i->from == DCPTime());
+	BOOST_CHECK(i->to == DCPTime::from_seconds(1));
 	++i;
-	BOOST_CHECK_EQUAL (i->from.get(), 96000);
-	BOOST_CHECK_EQUAL (i->to.get(), 96000 * 2);
+	BOOST_CHECK(i->from == DCPTime::from_seconds(1));
+	BOOST_CHECK(i->to == DCPTime::from_seconds(2));
 	++i;
-	BOOST_CHECK_EQUAL (i->from.get(), 96000 * 2);
-	BOOST_CHECK_EQUAL (i->to.get(), 96000 * 3);
+	BOOST_CHECK(i->from == DCPTime::from_seconds(2));
+	BOOST_CHECK(i->to == DCPTime::from_seconds(3));
 	++i;
-	BOOST_CHECK_EQUAL (i->from.get(), 96000 * 3);
-	BOOST_CHECK_EQUAL (i->to.get(), sub->full_length(film).ceil(film->video_frame_rate()).get());
+	BOOST_CHECK(i->from == DCPTime::from_seconds(3));
+	BOOST_CHECK(i->to == sub->full_length(film).ceil(film->video_frame_rate()));
 }
 
 
@@ -205,17 +205,17 @@ BOOST_AUTO_TEST_CASE (reels_test4)
 	auto reels = film->reels();
 	BOOST_REQUIRE_EQUAL (reels.size(), 4U);
 	auto i = reels.begin ();
-	BOOST_CHECK_EQUAL (i->from.get(), 0);
-	BOOST_CHECK_EQUAL (i->to.get(), 96000);
+	BOOST_CHECK(i->from == DCPTime::from_seconds(0));
+	BOOST_CHECK(i->to == DCPTime::from_seconds(1));
 	++i;
-	BOOST_CHECK_EQUAL (i->from.get(), 96000);
-	BOOST_CHECK_EQUAL (i->to.get(), 96000 * 2);
+	BOOST_CHECK(i->from == DCPTime::from_seconds(1));
+	BOOST_CHECK(i->to == DCPTime::from_seconds(2));
 	++i;
-	BOOST_CHECK_EQUAL (i->from.get(), 96000 * 2);
-	BOOST_CHECK_EQUAL (i->to.get(), 96000 * 3);
+	BOOST_CHECK(i->from == DCPTime::from_seconds(2));
+	BOOST_CHECK(i->to == DCPTime::from_seconds(3));
 	++i;
-	BOOST_CHECK_EQUAL (i->from.get(), 96000 * 3);
-	BOOST_CHECK_EQUAL (i->to.get(), 96000 * 4);
+	BOOST_CHECK(i->from == DCPTime::from_seconds(3));
+	BOOST_CHECK(i->to == DCPTime::from_seconds(4));
 
 	make_and_verify_dcp (
 		film,
@@ -412,15 +412,15 @@ BOOST_AUTO_TEST_CASE (reels_test11)
 	A->set_position (film, DCPTime::from_seconds(1));
 	film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
 	make_and_verify_dcp (film);
-	BOOST_CHECK_EQUAL (A->position().get(), DCPTime::from_seconds(1).get());
-	BOOST_CHECK_EQUAL (A->end(film).get(), DCPTime::from_seconds(1 + 10).get());
+	BOOST_CHECK(A->position() == DCPTime::from_seconds(1));
+	BOOST_CHECK(A->end(film) == DCPTime::from_seconds(1 + 10));
 
 	auto r = film->reels ();
-	BOOST_CHECK_EQUAL (r.size(), 2U);
-	BOOST_CHECK_EQUAL (r.front().from.get(), 0);
-	BOOST_CHECK_EQUAL (r.front().to.get(), DCPTime::from_seconds(1).get());
-	BOOST_CHECK_EQUAL (r.back().from.get(), DCPTime::from_seconds(1).get());
-	BOOST_CHECK_EQUAL (r.back().to.get(), DCPTime::from_seconds(1 + 10).get());
+	BOOST_CHECK_EQUAL(r.size(), 2U);
+	BOOST_CHECK(r.front().from == DCPTime());
+	BOOST_CHECK(r.front().to == DCPTime::from_seconds(1));
+	BOOST_CHECK(r.back().from == DCPTime::from_seconds(1));
+	BOOST_CHECK(r.back().to == DCPTime::from_seconds(1 + 10));
 }
 
 
@@ -448,17 +448,17 @@ BOOST_AUTO_TEST_CASE (reels_test12)
 	BOOST_REQUIRE_EQUAL (r.size(), 4U);
 	auto i = r.begin ();
 
-	BOOST_CHECK_EQUAL (i->from.get(), 0);
-	BOOST_CHECK_EQUAL (i->to.get(),   DCPTime::from_seconds(1).get());
+	BOOST_CHECK(i->from == DCPTime());
+	BOOST_CHECK(i->to ==   DCPTime::from_seconds(1));
 	++i;
-	BOOST_CHECK_EQUAL (i->from.get(), DCPTime::from_seconds(1).get());
-	BOOST_CHECK_EQUAL (i->to.get(),   DCPTime::from_seconds(11).get());
+	BOOST_CHECK(i->from == DCPTime::from_seconds(1));
+	BOOST_CHECK(i->to ==   DCPTime::from_seconds(11));
 	++i;
-	BOOST_CHECK_EQUAL (i->from.get(), DCPTime::from_seconds(11).get());
-	BOOST_CHECK_EQUAL (i->to.get(),   DCPTime::from_seconds(14).get());
+	BOOST_CHECK(i->from == DCPTime::from_seconds(11));
+	BOOST_CHECK(i->to ==   DCPTime::from_seconds(14));
 	++i;
-	BOOST_CHECK_EQUAL (i->from.get(), DCPTime::from_seconds(14).get());
-	BOOST_CHECK_EQUAL (i->to.get(),   DCPTime::from_seconds(19).get());
+	BOOST_CHECK(i->from == DCPTime::from_seconds(14));
+	BOOST_CHECK(i->to ==   DCPTime::from_seconds(19));
 }
 
 
diff --git a/test/time_calculation_test.cc b/test/time_calculation_test.cc
index abac4a6bd..3a543c9b4 100644
--- a/test/time_calculation_test.cc
+++ b/test/time_calculation_test.cc
@@ -142,19 +142,19 @@ BOOST_AUTO_TEST_CASE(ffmpeg_time_calculation_test)
 
 	/* 25fps content, 25fps DCP */
 	film->set_video_frame_rate(25);
-	BOOST_CHECK_EQUAL(content->full_length(film).get(), DCPTime::from_seconds(content->video->length() / 25.0).get());
+	BOOST_CHECK(content->full_length(film) == DCPTime::from_seconds(content->video->length() / 25.0));
 	/* 25fps content, 24fps DCP; length should be increased */
 	film->set_video_frame_rate(24);
-	BOOST_CHECK_EQUAL(content->full_length(film).get(), DCPTime::from_seconds(content->video->length() / 24.0).get());
+	BOOST_CHECK(content->full_length(film) == DCPTime::from_seconds(content->video->length() / 24.0));
 	/* 25fps content, 30fps DCP; length should be decreased */
 	film->set_video_frame_rate(30);
-	BOOST_CHECK_EQUAL(content->full_length(film).get(), DCPTime::from_seconds(content->video->length() / 30.0).get());
+	BOOST_CHECK(content->full_length(film) == DCPTime::from_seconds(content->video->length() / 30.0));
 	/* 25fps content, 50fps DCP; length should be the same */
 	film->set_video_frame_rate(50);
-	BOOST_CHECK_EQUAL(content->full_length(film).get(), DCPTime::from_seconds(content->video->length() / 25.0).get());
+	BOOST_CHECK(content->full_length(film) == DCPTime::from_seconds(content->video->length() / 25.0));
 	/* 25fps content, 60fps DCP; length should be decreased */
 	film->set_video_frame_rate(60);
-	BOOST_CHECK_EQUAL(content->full_length(film).get(), DCPTime::from_seconds(content->video->length() * (50.0 / 60) / 25.0).get());
+	BOOST_CHECK(content->full_length(film) == DCPTime::from_seconds(content->video->length() * (50.0 / 60) / 25.0));
 
 	/* Make the content audio-only */
 	content->video.reset();
@@ -162,24 +162,23 @@ BOOST_AUTO_TEST_CASE(ffmpeg_time_calculation_test)
 	/* 24fps content, 24fps DCP */
 	film->set_video_frame_rate(24);
 	content->set_video_frame_rate(film, 24);
-	BOOST_CHECK_EQUAL(content->full_length(film).get(), DCPTime::from_seconds(1).get());
+	BOOST_CHECK(content->full_length(film) == DCPTime::from_seconds(1));
 	/* 25fps content, 25fps DCP */
 	film->set_video_frame_rate(25);
 	content->set_video_frame_rate(film, 25);
-	BOOST_CHECK_EQUAL(content->full_length(film).get(), DCPTime::from_seconds(1).get());
+	BOOST_CHECK(content->full_length(film) == DCPTime::from_seconds(1));
 	/* 25fps content, 24fps DCP; length should be increased */
 	film->set_video_frame_rate(24);
-	BOOST_CHECK_SMALL(labs(content->full_length(film).get() - DCPTime::from_seconds(25.0 / 24).get()), 2L);
+	BOOST_CHECK(DCPTime(content->full_length(film) - DCPTime::from_seconds(25.0 / 24)).abs() <= DCPTime(2, 96000));
 	/* 25fps content, 30fps DCP; length should be decreased */
 	film->set_video_frame_rate(30);
-	BOOST_CHECK_EQUAL(content->full_length(film).get(), DCPTime::from_seconds(25.0 / 30).get());
+	BOOST_CHECK(content->full_length(film) == DCPTime::from_seconds(25.0 / 30));
 	/* 25fps content, 50fps DCP; length should be the same */
 	film->set_video_frame_rate(50);
-	BOOST_CHECK_EQUAL(content->full_length(film).get(), DCPTime::from_seconds(1).get());
+	BOOST_CHECK(content->full_length(film) == DCPTime::from_seconds(1));
 	/* 25fps content, 60fps DCP; length should be decreased */
 	film->set_video_frame_rate(60);
-	BOOST_CHECK_EQUAL(content->full_length(film).get(), DCPTime::from_seconds(50.0 / 60).get());
-
+	BOOST_CHECK(content->full_length(film) == DCPTime::from_seconds(50.0 / 60));
 }
 
 
@@ -412,9 +411,9 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test2)
 	player->setup_pieces();
 	BOOST_REQUIRE_EQUAL(player->_pieces.size(), 1U);
 	auto piece = player->_pieces.front();
-	BOOST_CHECK_EQUAL(player->content_video_to_dcp(piece, 0).get(), 0);
-	BOOST_CHECK_EQUAL(player->content_video_to_dcp(piece, 12).get(), DCPTime::from_seconds(0.5).get());
-	BOOST_CHECK_EQUAL(player->content_video_to_dcp(piece, 72).get(), DCPTime::from_seconds(3.0).get());
+	BOOST_CHECK(player->content_video_to_dcp(piece, 0) == DCPTime());
+	BOOST_CHECK(player->content_video_to_dcp(piece, 12) == DCPTime::from_seconds(0.5));
+	BOOST_CHECK(player->content_video_to_dcp(piece, 72) == DCPTime::from_seconds(3.0));
 
 	/* Position 3s, no trim, content rate = DCP rate */
 	content->set_position(film, DCPTime::from_seconds(3));
@@ -424,9 +423,9 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test2)
 	player->setup_pieces();
 	BOOST_REQUIRE_EQUAL(player->_pieces.size(), 1U);
 	piece = player->_pieces.front();
-	BOOST_CHECK_EQUAL(player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(3.00).get());
-	BOOST_CHECK_EQUAL(player->content_video_to_dcp(piece, 36).get(), DCPTime::from_seconds(4.50).get());
-	BOOST_CHECK_EQUAL(player->content_video_to_dcp(piece, 162).get(), DCPTime::from_seconds(9.75).get());
+	BOOST_CHECK(player->content_video_to_dcp(piece, 0) == DCPTime::from_seconds(3.00));
+	BOOST_CHECK(player->content_video_to_dcp(piece, 36) == DCPTime::from_seconds(4.50));
+	BOOST_CHECK(player->content_video_to_dcp(piece, 162) == DCPTime::from_seconds(9.75));
 
 	/* Position 3s, 1.5s trim, content rate = DCP rate */
 	content->set_position(film, DCPTime::from_seconds(3));
@@ -436,10 +435,10 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test2)
 	player->setup_pieces();
 	BOOST_REQUIRE_EQUAL(player->_pieces.size(), 1U);
 	piece = player->_pieces.front();
-	BOOST_CHECK_EQUAL(player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(1.50).get());
-	BOOST_CHECK_EQUAL(player->content_video_to_dcp(piece, 36).get(), DCPTime::from_seconds(3.00).get());
-	BOOST_CHECK_EQUAL(player->content_video_to_dcp(piece, 72).get(), DCPTime::from_seconds(4.50).get());
-	BOOST_CHECK_EQUAL(player->content_video_to_dcp(piece, 198).get(), DCPTime::from_seconds(9.75).get());
+	BOOST_CHECK(player->content_video_to_dcp(piece, 0) == DCPTime::from_seconds(1.50));
+	BOOST_CHECK(player->content_video_to_dcp(piece, 36) == DCPTime::from_seconds(3.00));
+	BOOST_CHECK(player->content_video_to_dcp(piece, 72) == DCPTime::from_seconds(4.50));
+	BOOST_CHECK(player->content_video_to_dcp(piece, 198) == DCPTime::from_seconds(9.75));
 
 	/* Position 0, no trim, content rate 24, DCP rate 25.
 	   Now, for example, a DCPTime position of 3s means 3s at 25fps.  Since we run the video
@@ -452,9 +451,9 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test2)
 	player->setup_pieces();
 	BOOST_REQUIRE_EQUAL(player->_pieces.size(), 1U);
 	piece = player->_pieces.front();
-	BOOST_CHECK_EQUAL(player->content_video_to_dcp(piece, 0).get(), 0);
-	BOOST_CHECK_EQUAL(player->content_video_to_dcp(piece, 15).get(), DCPTime::from_seconds(0.6).get());
-	BOOST_CHECK_EQUAL(player->content_video_to_dcp(piece, 75).get(), DCPTime::from_seconds(3.0).get());
+	BOOST_CHECK(player->content_video_to_dcp(piece, 0) == DCPTime());
+	BOOST_CHECK(player->content_video_to_dcp(piece, 15) == DCPTime::from_seconds(0.6));
+	BOOST_CHECK(player->content_video_to_dcp(piece, 75) == DCPTime::from_seconds(3.0));
 
 	/* Position 3s, no trim, content rate 24, DCP rate 25 */
 	content->set_position(film, DCPTime::from_seconds(3));
@@ -464,9 +463,9 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test2)
 	player->setup_pieces();
 	BOOST_REQUIRE_EQUAL(player->_pieces.size(), 1U);
 	piece = player->_pieces.front();
-	BOOST_CHECK_EQUAL(player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(3.00).get());
-	BOOST_CHECK_EQUAL(player->content_video_to_dcp(piece, 40).get(), DCPTime::from_seconds(4.60).get());
-	BOOST_CHECK_EQUAL(player->content_video_to_dcp(piece, 169).get(), DCPTime::from_seconds(9.76).get());
+	BOOST_CHECK(player->content_video_to_dcp(piece, 0) == DCPTime::from_seconds(3.00));
+	BOOST_CHECK(player->content_video_to_dcp(piece, 40) == DCPTime::from_seconds(4.60));
+	BOOST_CHECK(player->content_video_to_dcp(piece, 169) == DCPTime::from_seconds(9.76));
 
 	/* Position 3s, 1.6s trim, content rate 24, DCP rate 25, so the 1.6s trim is at 24fps */
 	content->set_position(film, DCPTime::from_seconds(3));
@@ -494,9 +493,9 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test2)
 	player->setup_pieces();
 	BOOST_REQUIRE_EQUAL(player->_pieces.size(), 1U);
 	piece = player->_pieces.front();
-	BOOST_CHECK_EQUAL(player->content_video_to_dcp(piece, 0).get(), 0);
-	BOOST_CHECK_EQUAL(player->content_video_to_dcp(piece, 12).get(), DCPTime::from_seconds(0.5).get());
-	BOOST_CHECK_EQUAL(player->content_video_to_dcp(piece, 72).get(), DCPTime::from_seconds(3.0).get());
+	BOOST_CHECK(player->content_video_to_dcp(piece, 0) == DCPTime());
+	BOOST_CHECK(player->content_video_to_dcp(piece, 12) == DCPTime::from_seconds(0.5));
+	BOOST_CHECK(player->content_video_to_dcp(piece, 72) == DCPTime::from_seconds(3.0));
 
 	/* Position 3s, no trim, content rate 24, DCP rate 48 */
 	content->set_position(film, DCPTime::from_seconds(3));
@@ -506,9 +505,9 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test2)
 	player->setup_pieces();
 	BOOST_REQUIRE_EQUAL(player->_pieces.size(), 1U);
 	piece = player->_pieces.front();
-	BOOST_CHECK_EQUAL(player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(3.00).get());
-	BOOST_CHECK_EQUAL(player->content_video_to_dcp(piece, 36).get(), DCPTime::from_seconds(4.50).get());
-	BOOST_CHECK_EQUAL(player->content_video_to_dcp(piece, 162).get(), DCPTime::from_seconds(9.75).get());
+	BOOST_CHECK(player->content_video_to_dcp(piece, 0) == DCPTime::from_seconds(3.00));
+	BOOST_CHECK(player->content_video_to_dcp(piece, 36) == DCPTime::from_seconds(4.50));
+	BOOST_CHECK(player->content_video_to_dcp(piece, 162) == DCPTime::from_seconds(9.75));
 
 	/* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
 	content->set_position(film, DCPTime::from_seconds(3));
@@ -518,10 +517,10 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test2)
 	player->setup_pieces();
 	BOOST_REQUIRE_EQUAL(player->_pieces.size(), 1U);
 	piece = player->_pieces.front();
-	BOOST_CHECK_EQUAL(player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(1.50).get());
-	BOOST_CHECK_EQUAL(player->content_video_to_dcp(piece, 36).get(), DCPTime::from_seconds(3.00).get());
-	BOOST_CHECK_EQUAL(player->content_video_to_dcp(piece, 72).get(), DCPTime::from_seconds(4.50).get());
-	BOOST_CHECK_EQUAL(player->content_video_to_dcp(piece, 198).get(), DCPTime::from_seconds(9.75).get());
+	BOOST_CHECK(player->content_video_to_dcp(piece, 0) == DCPTime::from_seconds(1.50));
+	BOOST_CHECK(player->content_video_to_dcp(piece, 36) == DCPTime::from_seconds(3.00));
+	BOOST_CHECK(player->content_video_to_dcp(piece, 72) == DCPTime::from_seconds(4.50));
+	BOOST_CHECK(player->content_video_to_dcp(piece, 198) == DCPTime::from_seconds(9.75));
 
 	/* Position 0, no trim, content rate 48, DCP rate 24
 	   Now, for example, a DCPTime position of 3s means 3s at 24fps.  Since we run the video
@@ -535,9 +534,9 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test2)
 	player->setup_pieces();
 	BOOST_REQUIRE_EQUAL(player->_pieces.size(), 1U);
 	piece = player->_pieces.front();
-	BOOST_CHECK_EQUAL(player->content_video_to_dcp(piece, 0).get(), 0);
-	BOOST_CHECK_EQUAL(player->content_video_to_dcp(piece, 24).get(), DCPTime::from_seconds(0.5).get());
-	BOOST_CHECK_EQUAL(player->content_video_to_dcp(piece, 144).get(), DCPTime::from_seconds(3.0).get());
+	BOOST_CHECK(player->content_video_to_dcp(piece, 0) == DCPTime());
+	BOOST_CHECK(player->content_video_to_dcp(piece, 24) == DCPTime::from_seconds(0.5));
+	BOOST_CHECK(player->content_video_to_dcp(piece, 144) == DCPTime::from_seconds(3.0));
 
 	/* Position 3s, no trim, content rate 24, DCP rate 48 */
 	content->set_position(film, DCPTime::from_seconds(3));
@@ -547,9 +546,9 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test2)
 	player->setup_pieces();
 	BOOST_REQUIRE_EQUAL(player->_pieces.size(), 1U);
 	piece = player->_pieces.front();
-	BOOST_CHECK_EQUAL(player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(3.00).get());
-	BOOST_CHECK_EQUAL(player->content_video_to_dcp(piece, 72).get(), DCPTime::from_seconds(4.50).get());
-	BOOST_CHECK_EQUAL(player->content_video_to_dcp(piece, 324).get(), DCPTime::from_seconds(9.75).get());
+	BOOST_CHECK(player->content_video_to_dcp(piece, 0) == DCPTime::from_seconds(3.00));
+	BOOST_CHECK(player->content_video_to_dcp(piece, 72) == DCPTime::from_seconds(4.50));
+	BOOST_CHECK(player->content_video_to_dcp(piece, 324) == DCPTime::from_seconds(9.75));
 
 	/* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
 	content->set_position(film, DCPTime::from_seconds(3));
@@ -559,10 +558,10 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test2)
 	player->setup_pieces();
 	BOOST_REQUIRE_EQUAL(player->_pieces.size(), 1U);
 	piece = player->_pieces.front();
-	BOOST_CHECK_EQUAL(player->content_video_to_dcp(piece, 0).get(), DCPTime::from_seconds(1.50).get());
-	BOOST_CHECK_EQUAL(player->content_video_to_dcp(piece, 72).get(), DCPTime::from_seconds(3.00).get());
-	BOOST_CHECK_EQUAL(player->content_video_to_dcp(piece, 144).get(), DCPTime::from_seconds(4.50).get());
-	BOOST_CHECK_EQUAL(player->content_video_to_dcp(piece, 396).get(), DCPTime::from_seconds(9.75).get());
+	BOOST_CHECK(player->content_video_to_dcp(piece, 0) == DCPTime::from_seconds(1.50));
+	BOOST_CHECK(player->content_video_to_dcp(piece, 72) == DCPTime::from_seconds(3.00));
+	BOOST_CHECK(player->content_video_to_dcp(piece, 144) == DCPTime::from_seconds(4.50));
+	BOOST_CHECK(player->content_video_to_dcp(piece, 396) == DCPTime::from_seconds(9.75));
 }
 
 /** Test Player::dcp_to_content_audio */