operator bool on Time is a really bad idea; removed it and fixed lots of bugs.

12 files changed, 59 insertions, 59 deletions

diff --git a/test/audio_analysis_test.cc b/test/audio_analysis_test.cc
index 77b2aeaf6..b94b12056 100644
--- a/test/audio_analysis_test.cc
+++ b/test/audio_analysis_test.cc
@@ -50,7 +50,7 @@ BOOST_AUTO_TEST_CASE (audio_analysis_test)
 
 	AudioAnalysis b ("build/test/audio_analysis_test");
 	for (int i = 0; i < channels; ++i) {
-		BOOST_CHECK (b.points(i) == points);
+		BOOST_CHECK_EQUAL (b.points(i), points);
 		for (int j = 0; j < points; ++j) {
 			AudioPoint p = b.get_point (i, j);
 			BOOST_CHECK_CLOSE (p[AudioPoint::PEAK], random_float (), 1);
diff --git a/test/audio_merger_test.cc b/test/audio_merger_test.cc
index e8af22d2a..c65c0defd 100644
--- a/test/audio_merger_test.cc
+++ b/test/audio_merger_test.cc
@@ -47,7 +47,7 @@ BOOST_AUTO_TEST_CASE (audio_merger_test1)
 	TimedAudioBuffers<DCPTime> tb = merger.pull (DCPTime::from_frames (22, frame_rate));
 	BOOST_CHECK (tb.audio != shared_ptr<const AudioBuffers> ());
 	BOOST_CHECK_EQUAL (tb.audio->frames(), 22);
-	BOOST_CHECK_EQUAL (tb.time, 0);
+	BOOST_CHECK_EQUAL (tb.time, DCPTime ());
 
 	/* And they should be a staircase */
 	for (int i = 0; i < 22; ++i) {
@@ -84,7 +84,7 @@ BOOST_AUTO_TEST_CASE (audio_merger_test2)
 
 	TimedAudioBuffers<DCPTime> tb = merger.pull (DCPTime::from_frames (9, frame_rate));
 	BOOST_CHECK_EQUAL (tb.audio->frames(), 9);
-	BOOST_CHECK_EQUAL (tb.time, 0);
+	BOOST_CHECK_EQUAL (tb.time, DCPTime ());
 	
 	for (int i = 0; i < 9; ++i) {
 		BOOST_CHECK_EQUAL (tb.audio->data()[0][i], 0);
@@ -94,7 +94,7 @@ BOOST_AUTO_TEST_CASE (audio_merger_test2)
 
 	/* That flush should give us 64 samples at 9 */
 	BOOST_CHECK_EQUAL (tb.audio->frames(), 64);
-	BOOST_CHECK_EQUAL (tb.time, 9);
+	BOOST_CHECK_EQUAL (tb.time, DCPTime::from_frames (9, frame_rate));
 	
 	/* Check the sample values */
 	for (int i = 0; i < 64; ++i) {
diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index a80297ec6..54bbd520f 100644
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -36,7 +36,7 @@ do_remote_encode (shared_ptr<DCPVideoFrame> frame, ServerDescription description
 	BOOST_CHECK (remotely_encoded);
 	
 	BOOST_CHECK_EQUAL (locally_encoded->size(), remotely_encoded->size());
-	BOOST_CHECK (memcmp (locally_encoded->data(), remotely_encoded->data(), locally_encoded->size()) == 0);
+	BOOST_CHECK_EQUAL (memcmp (locally_encoded->data(), remotely_encoded->data(), locally_encoded->size()), 0);
 }
 
 BOOST_AUTO_TEST_CASE (client_server_test)
diff --git a/test/ffmpeg_audio_test.cc b/test/ffmpeg_audio_test.cc
index 894255879..48422259c 100644
--- a/test/ffmpeg_audio_test.cc
+++ b/test/ffmpeg_audio_test.cc
@@ -65,7 +65,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
 
 	shared_ptr<const dcp::ReelSoundAsset> sound_asset = check.cpls().front()->reels().front()->main_sound ();
 	BOOST_CHECK (sound_asset);
-	BOOST_CHECK (sound_asset->mxf()->channels () == 6);
+	BOOST_CHECK_EQUAL (sound_asset->mxf()->channels (), 6);
 
 	/* Sample index in the DCP */
 	int n = 0;
diff --git a/test/ffmpeg_examiner_test.cc b/test/ffmpeg_examiner_test.cc
index a3b9bb4f6..93a913870 100644
--- a/test/ffmpeg_examiner_test.cc
+++ b/test/ffmpeg_examiner_test.cc
@@ -30,7 +30,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_examiner_test)
 	shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/count300bd24.m2ts"));
 	shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (content));
 
-	BOOST_CHECK_EQUAL (examiner->first_video().get(), 600);
+	BOOST_CHECK_EQUAL (examiner->first_video().get(), ContentTime (600));
 	BOOST_CHECK_EQUAL (examiner->audio_streams().size(), 1);
-	BOOST_CHECK_EQUAL (examiner->audio_streams()[0]->first_audio.get(), 600);
+	BOOST_CHECK_EQUAL (examiner->audio_streams()[0]->first_audio.get(), ContentTime (600));
 }
diff --git a/test/ffmpeg_pts_offset.cc b/test/ffmpeg_pts_offset.cc
index 53303f154..4a9a57b40 100644
--- a/test/ffmpeg_pts_offset.cc
+++ b/test/ffmpeg_pts_offset.cc
@@ -34,43 +34,43 @@ BOOST_AUTO_TEST_CASE (ffmpeg_pts_offset_test)
 
 	{
 		/* Sound == video so no offset required */
-		content->_first_video = 0;
-		content->_audio_stream->first_audio = 0;
+		content->_first_video = ContentTime ();
+		content->_audio_stream->first_audio = ContentTime ();
 		FFmpegDecoder decoder (film, content, true, true);
-		BOOST_CHECK_EQUAL (decoder._pts_offset, 0);
+		BOOST_CHECK_EQUAL (decoder._pts_offset, ContentTime ());
 	}
 
 	{
 		/* Common offset should be removed */
-		content->_first_video = 600;
-		content->_audio_stream->first_audio = 600;
+		content->_first_video = ContentTime::from_seconds (600);
+		content->_audio_stream->first_audio = ContentTime::from_seconds (600);
 		FFmpegDecoder decoder (film, content, true, true);
-		BOOST_CHECK_EQUAL (decoder._pts_offset, -600);
+		BOOST_CHECK_EQUAL (decoder._pts_offset, ContentTime::from_seconds (-600));
 	}
 
 	{
 		/* Video is on a frame boundary */
-		content->_first_video = 1.0 / 24.0;
-		content->_audio_stream->first_audio = 0;
+		content->_first_video = ContentTime::from_frames (1, 24);
+		content->_audio_stream->first_audio = ContentTime ();
 		FFmpegDecoder decoder (film, content, true, true);
-		BOOST_CHECK_EQUAL (decoder._pts_offset, 0);
+		BOOST_CHECK_EQUAL (decoder._pts_offset, ContentTime ());
 	}
 
 	{
 		/* Video is off a frame boundary */
 		double const frame = 1.0 / 24.0;
-		content->_first_video = frame + 0.0215;
-		content->_audio_stream->first_audio = 0;
+		content->_first_video = ContentTime::from_seconds (frame + 0.0215);
+		content->_audio_stream->first_audio = ContentTime ();
 		FFmpegDecoder decoder (film, content, true, true);
-		BOOST_CHECK_CLOSE (decoder._pts_offset, (frame - 0.0215), 0.00001);
+		BOOST_CHECK_CLOSE (decoder._pts_offset.seconds(), (frame - 0.0215), 0.00001);
 	}
 
 	{
 		/* Video is off a frame boundary and both have a common offset */
 		double const frame = 1.0 / 24.0;
-		content->_first_video = frame + 0.0215 + 4.1;
-		content->_audio_stream->first_audio = 4.1;
+		content->_first_video = ContentTime::from_seconds (frame + 0.0215 + 4.1);
+		content->_audio_stream->first_audio = ContentTime::from_seconds (4.1);
 		FFmpegDecoder decoder (film, content, true, true);
-		BOOST_CHECK_EQUAL (decoder._pts_offset, (frame - 0.0215) - 4.1);
+		BOOST_CHECK_EQUAL (decoder._pts_offset.seconds(), (frame - 0.0215) - 4.1);
 	}
 }
diff --git a/test/ffmpeg_seek_test.cc b/test/ffmpeg_seek_test.cc
index ccc59e064..c25a071de 100644
--- a/test/ffmpeg_seek_test.cc
+++ b/test/ffmpeg_seek_test.cc
@@ -62,7 +62,7 @@ static string
 print_time (DCPTime t, float fps)
 {
 	stringstream s;
-	s << t << " " << t.seconds() << "s " << t.frames (fps) << "f";
+	s << t.seconds() << "s " << t.frames (fps) << "f";
 	return s.str ();
 }
 
@@ -90,8 +90,8 @@ check (shared_ptr<Player> p, DCPTime t)
 	BOOST_CHECK (first_video.get() >= t);
 	BOOST_CHECK (first_audio.get() >= t);
 	/* And should be rounded to frame boundaries */
-	BOOST_CHECK (first_video.get() == first_video.get().round_up (film->video_frame_rate()));
-	BOOST_CHECK (first_audio.get() == first_audio.get().round_up (film->audio_frame_rate()));
+	BOOST_CHECK_EQUAL (first_video.get(), first_video.get().round_up (film->video_frame_rate()));
+	BOOST_CHECK_EQUAL (first_audio.get(), first_audio.get().round_up (film->audio_frame_rate()));
 }
 
 /* Test basic seeking */
diff --git a/test/image_test.cc b/test/image_test.cc
index 622a9e4db..f876c8f65 100644
--- a/test/image_test.cc
+++ b/test/image_test.cc
@@ -50,9 +50,9 @@ BOOST_AUTO_TEST_CASE (aligned_image_test)
 	BOOST_CHECK (t->data() != s->data());
 	BOOST_CHECK (t->data()[0] != s->data()[0]);
 	BOOST_CHECK (t->line_size() != s->line_size());
-	BOOST_CHECK (t->line_size()[0] == s->line_size()[0]);
+	BOOST_CHECK_EQUAL (t->line_size()[0], s->line_size()[0]);
 	BOOST_CHECK (t->stride() != s->stride());
-	BOOST_CHECK (t->stride()[0] == s->stride()[0]);
+	BOOST_CHECK_EQUAL (t->stride()[0], s->stride()[0]);
 
 	/* assignment operator */
 	Image* u = new Image (PIX_FMT_YUV422P, dcp::Size (150, 150), false);
@@ -67,9 +67,9 @@ BOOST_AUTO_TEST_CASE (aligned_image_test)
 	BOOST_CHECK (u->data() != s->data());
 	BOOST_CHECK (u->data()[0] != s->data()[0]);
 	BOOST_CHECK (u->line_size() != s->line_size());
-	BOOST_CHECK (u->line_size()[0] == s->line_size()[0]);
+	BOOST_CHECK_EQUAL (u->line_size()[0], s->line_size()[0]);
 	BOOST_CHECK (u->stride() != s->stride());
-	BOOST_CHECK (u->stride()[0] == s->stride()[0]);
+	BOOST_CHECK_EQUAL (u->stride()[0], s->stride()[0]);
 
 	delete s;
 	delete t;
@@ -99,9 +99,9 @@ BOOST_AUTO_TEST_CASE (compact_image_test)
 	BOOST_CHECK (t->data() != s->data());
 	BOOST_CHECK (t->data()[0] != s->data()[0]);
 	BOOST_CHECK (t->line_size() != s->line_size());
-	BOOST_CHECK (t->line_size()[0] == s->line_size()[0]);
+	BOOST_CHECK_EQUAL (t->line_size()[0], s->line_size()[0]);
 	BOOST_CHECK (t->stride() != s->stride());
-	BOOST_CHECK (t->stride()[0] == s->stride()[0]);
+	BOOST_CHECK_EQUAL (t->stride()[0], s->stride()[0]);
 
 	/* assignment operator */
 	Image* u = new Image (PIX_FMT_YUV422P, dcp::Size (150, 150), true);
@@ -116,9 +116,9 @@ BOOST_AUTO_TEST_CASE (compact_image_test)
 	BOOST_CHECK (u->data() != s->data());
 	BOOST_CHECK (u->data()[0] != s->data()[0]);
 	BOOST_CHECK (u->line_size() != s->line_size());
-	BOOST_CHECK (u->line_size()[0] == s->line_size()[0]);
+	BOOST_CHECK_EQUAL (u->line_size()[0], s->line_size()[0]);
 	BOOST_CHECK (u->stride() != s->stride());
-	BOOST_CHECK (u->stride()[0] == s->stride()[0]);
+	BOOST_CHECK_EQUAL (u->stride()[0], s->stride()[0]);
 
 	delete s;
 	delete t;
diff --git a/test/play_test.cc b/test/play_test.cc
index 5ffc55a8e..690b042d8 100644
--- a/test/play_test.cc
+++ b/test/play_test.cc
@@ -89,18 +89,18 @@ BOOST_AUTO_TEST_CASE (play_test)
 	film->examine_and_add_content (A);
 	wait_for_jobs ();
 
-	BOOST_CHECK_EQUAL (A->video_length(), 16);
+	BOOST_CHECK_EQUAL (A->video_length().frames (24), 16);
 
 	shared_ptr<FFmpegContent> B (new FFmpegContent (film, "test/data/red_30.mp4"));
 	film->examine_and_add_content (B);
 	wait_for_jobs ();
 
-	BOOST_CHECK_EQUAL (B->video_length(), 16);
+	BOOST_CHECK_EQUAL (B->video_length().frames (30), 16);
 	
 	/* Film should have been set to 25fps */
 	BOOST_CHECK_EQUAL (film->video_frame_rate(), 25);
 
-	BOOST_CHECK_EQUAL (A->position(), 0);
+	BOOST_CHECK_EQUAL (A->position(), DCPTime ());
 	/* A is 16 frames long at 25 fps */
 	BOOST_CHECK_EQUAL (B->position(), DCPTime::from_frames (16, 25));
 
diff --git a/test/silence_padding_test.cc b/test/silence_padding_test.cc
index bfc225f54..e4472ad4f 100644
--- a/test/silence_padding_test.cc
+++ b/test/silence_padding_test.cc
@@ -58,7 +58,7 @@ static void test_silence_padding (int channels)
 
 	shared_ptr<const dcp::ReelSoundAsset> sound_asset = check.cpls().front()->reels().front()->main_sound ();
 	BOOST_CHECK (sound_asset);
-	BOOST_CHECK (sound_asset->mxf()->channels () == channels);
+	BOOST_CHECK_EQUAL (sound_asset->mxf()->channels (), channels);
 
 	/* Sample index in the DCP */
 	int n = 0;
diff --git a/test/subrip_test.cc b/test/subrip_test.cc
index d8c2d75de..315c0cf1e 100644
--- a/test/subrip_test.cc
+++ b/test/subrip_test.cc
@@ -130,45 +130,45 @@ BOOST_AUTO_TEST_CASE (subrip_parse_test)
 	vector<SubRipSubtitle>::const_iterator i = s._subtitles.begin();
 
 	BOOST_CHECK (i != s._subtitles.end ());
-	BOOST_CHECK_EQUAL (i->from, DCPTime::from_seconds ((1 * 60) + 49.200));
-	BOOST_CHECK_EQUAL (i->to, DCPTime::from_seconds ((1 * 60) + 52.351));
+	BOOST_CHECK_EQUAL (i->from, ContentTime::from_seconds ((1 * 60) + 49.200));
+	BOOST_CHECK_EQUAL (i->to, ContentTime::from_seconds ((1 * 60) + 52.351));
 	BOOST_CHECK_EQUAL (i->pieces.size(), 1);
 	BOOST_CHECK_EQUAL (i->pieces.front().text, "This is a subtitle, and it goes over two lines.");
 
 	++i;
 	BOOST_CHECK (i != s._subtitles.end ());
-	BOOST_CHECK_EQUAL (i->from, DCPTime::from_seconds ((1 * 60) + 52.440));
-	BOOST_CHECK_EQUAL (i->to, DCPTime::from_seconds ((1 * 60) + 54.351));
+	BOOST_CHECK_EQUAL (i->from, ContentTime::from_seconds ((1 * 60) + 52.440));
+	BOOST_CHECK_EQUAL (i->to, ContentTime::from_seconds ((1 * 60) + 54.351));
 	BOOST_CHECK_EQUAL (i->pieces.size(), 1);
 	BOOST_CHECK_EQUAL (i->pieces.front().text, "We have emboldened this");
 	BOOST_CHECK_EQUAL (i->pieces.front().bold, true);
 
 	++i;
 	BOOST_CHECK (i != s._subtitles.end ());
-	BOOST_CHECK_EQUAL (i->from, DCPTime::from_seconds ((1 * 60) + 54.440));
-	BOOST_CHECK_EQUAL (i->to, DCPTime::from_seconds ((1 * 60) + 56.590));
+	BOOST_CHECK_EQUAL (i->from, ContentTime::from_seconds ((1 * 60) + 54.440));
+	BOOST_CHECK_EQUAL (i->to, ContentTime::from_seconds ((1 * 60) + 56.590));
 	BOOST_CHECK_EQUAL (i->pieces.size(), 1);
 	BOOST_CHECK_EQUAL (i->pieces.front().text, "And italicised this.");
 	BOOST_CHECK_EQUAL (i->pieces.front().italic, true);
 
 	++i;
 	BOOST_CHECK (i != s._subtitles.end ());
-	BOOST_CHECK_EQUAL (i->from, DCPTime::from_seconds ((1 * 60) + 56.680));
-	BOOST_CHECK_EQUAL (i->to, DCPTime::from_seconds ((1 * 60) + 58.955));
+	BOOST_CHECK_EQUAL (i->from, ContentTime::from_seconds ((1 * 60) + 56.680));
+	BOOST_CHECK_EQUAL (i->to, ContentTime::from_seconds ((1 * 60) + 58.955));
 	BOOST_CHECK_EQUAL (i->pieces.size(), 1);
 	BOOST_CHECK_EQUAL (i->pieces.front().text, "Shall I compare thee to a summers' day?");
 
 	++i;
 	BOOST_CHECK (i != s._subtitles.end ());
-	BOOST_CHECK_EQUAL (i->from, DCPTime::from_seconds ((2 * 60) + 0.840));
-	BOOST_CHECK_EQUAL (i->to, DCPTime::from_seconds ((2 * 60) + 3.400));
+	BOOST_CHECK_EQUAL (i->from, ContentTime::from_seconds ((2 * 60) + 0.840));
+	BOOST_CHECK_EQUAL (i->to, ContentTime::from_seconds ((2 * 60) + 3.400));
 	BOOST_CHECK_EQUAL (i->pieces.size(), 1);
 	BOOST_CHECK_EQUAL (i->pieces.front().text, "Is this a dagger I see before me?");
 
 	++i;
 	BOOST_CHECK (i != s._subtitles.end ());
-	BOOST_CHECK_EQUAL (i->from, DCPTime::from_seconds ((3 * 60) + 54.560));
-	BOOST_CHECK_EQUAL (i->to, DCPTime::from_seconds ((3 * 60) + 56.471));
+	BOOST_CHECK_EQUAL (i->from, ContentTime::from_seconds ((3 * 60) + 54.560));
+	BOOST_CHECK_EQUAL (i->to, ContentTime::from_seconds ((3 * 60) + 56.471));
 	BOOST_CHECK_EQUAL (i->pieces.size(), 1);
 	BOOST_CHECK_EQUAL (i->pieces.front().text, "Hello world.");
 
diff --git a/test/util_test.cc b/test/util_test.cc
index 3373bf86b..25b814004 100644
--- a/test/util_test.cc
+++ b/test/util_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -57,15 +57,15 @@ BOOST_AUTO_TEST_CASE (md5_digest_test)
 /* Straightforward test of DCPTime::round_up */
 BOOST_AUTO_TEST_CASE (dcptime_round_up_test)
 {
-	BOOST_CHECK_EQUAL (DCPTime (0).round_up (DCPTime::HZ / 2), 0);
-	BOOST_CHECK_EQUAL (DCPTime (1).round_up (DCPTime::HZ / 2), 2);
-	BOOST_CHECK_EQUAL (DCPTime (2).round_up (DCPTime::HZ / 2), 2);
-	BOOST_CHECK_EQUAL (DCPTime (3).round_up (DCPTime::HZ / 2), 4);
+	BOOST_CHECK_EQUAL (DCPTime (0).round_up (DCPTime::HZ / 2), DCPTime (0));
+	BOOST_CHECK_EQUAL (DCPTime (1).round_up (DCPTime::HZ / 2), DCPTime (2));
+	BOOST_CHECK_EQUAL (DCPTime (2).round_up (DCPTime::HZ / 2), DCPTime (2));
+	BOOST_CHECK_EQUAL (DCPTime (3).round_up (DCPTime::HZ / 2), DCPTime (4));
 	
-	BOOST_CHECK_EQUAL (DCPTime (0).round_up (DCPTime::HZ / 42), 0);
-	BOOST_CHECK_EQUAL (DCPTime (1).round_up (DCPTime::HZ / 42), 42);
-	BOOST_CHECK_EQUAL (DCPTime (42).round_up (DCPTime::HZ / 42), 42);
-	BOOST_CHECK_EQUAL (DCPTime (43).round_up (DCPTime::HZ / 42), 84);
+	BOOST_CHECK_EQUAL (DCPTime (0).round_up (DCPTime::HZ / 42), DCPTime (0));
+	BOOST_CHECK_EQUAL (DCPTime (1).round_up (DCPTime::HZ / 42), DCPTime (42));
+	BOOST_CHECK_EQUAL (DCPTime (42).round_up (DCPTime::HZ / 42), DCPTime (42));
+	BOOST_CHECK_EQUAL (DCPTime (43).round_up (DCPTime::HZ / 42), DCPTime (84));
 }