X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fplayer_test.cc;h=12e928a3528a9267840b035e4cd7e0eb10bf0e51;hb=b0afedfb0b2fbdeb2fa63c593609027bc6b7e050;hp=d480602422b0ee1a810cfc74a1e38c0ad575eb1b;hpb=9e4c091e6ef0f79fab10664e95240de2f14e5702;p=dcpomatic.git

diff --git a/test/player_test.cc b/test/player_test.cc
index d48060242..12e928a35 100644
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -40,6 +40,8 @@ BOOST_AUTO_TEST_CASE (player_overlaps_test)
 {
 	shared_ptr<Film> film = new_test_film ("player_overlaps_test");
 	film->set_container (Ratio::from_id ("185"));
+
+	/* This content is 3s long */
 	shared_ptr<FFmpegContent> A (new FFmpegContent (film, "test/data/test.mp4"));
 	shared_ptr<FFmpegContent> B (new FFmpegContent (film, "test/data/test.mp4"));
 	shared_ptr<FFmpegContent> C (new FFmpegContent (film, "test/data/test.mp4"));
@@ -49,32 +51,32 @@ BOOST_AUTO_TEST_CASE (player_overlaps_test)
 	film->examine_and_add_content (C);
 	wait_for_jobs ();
 
-	BOOST_CHECK_EQUAL (A->full_length(), DCPTime (280000));
+	BOOST_CHECK_EQUAL (A->full_length(), DCPTime (288000));
 
 	A->set_position (DCPTime::from_seconds (0));
 	B->set_position (DCPTime::from_seconds (10));
 	C->set_position (DCPTime::from_seconds (20));
 
-	shared_ptr<Player> player = film->make_player ();
+	shared_ptr<Player> player (new Player (film, film->playlist ()));
 
 	list<shared_ptr<Piece> > o = player->overlaps<FFmpegContent> (DCPTime::from_seconds (0), DCPTime::from_seconds (5));
-	BOOST_CHECK_EQUAL (o.size(), 1);
+	BOOST_CHECK_EQUAL (o.size(), 1U);
 	BOOST_CHECK_EQUAL (o.front()->content, A);
 
 	o = player->overlaps<FFmpegContent> (DCPTime::from_seconds (5), DCPTime::from_seconds (8));
-	BOOST_CHECK_EQUAL (o.size(), 0);
+	BOOST_CHECK_EQUAL (o.size(), 0U);
 
 	o = player->overlaps<FFmpegContent> (DCPTime::from_seconds (8), DCPTime::from_seconds (12));
-	BOOST_CHECK_EQUAL (o.size(), 1);
+	BOOST_CHECK_EQUAL (o.size(), 1U);
 	BOOST_CHECK_EQUAL (o.front()->content, B);
 
 	o = player->overlaps<FFmpegContent> (DCPTime::from_seconds (2), DCPTime::from_seconds (12));
-	BOOST_CHECK_EQUAL (o.size(), 2);
+	BOOST_CHECK_EQUAL (o.size(), 2U);
 	BOOST_CHECK_EQUAL (o.front()->content, A);
 	BOOST_CHECK_EQUAL (o.back()->content, B);
 
 	o = player->overlaps<FFmpegContent> (DCPTime::from_seconds (8), DCPTime::from_seconds (11));
-	BOOST_CHECK_EQUAL (o.size(), 1);
+	BOOST_CHECK_EQUAL (o.size(), 1U);
 	BOOST_CHECK_EQUAL (o.front()->content, B);
 }
 
@@ -86,11 +88,11 @@ BOOST_AUTO_TEST_CASE (player_silence_padding_test)
 	shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4"));
 	film->set_container (Ratio::from_id ("185"));
 	film->set_audio_channels (6);
-	
+
 	film->examine_and_add_content (c);
 	wait_for_jobs ();
 
-	shared_ptr<Player> player = film->make_player ();
+	shared_ptr<Player> player (new Player (film, film->playlist ()));
 	shared_ptr<AudioBuffers> test = player->get_audio (DCPTime (0), DCPTime::from_seconds (1), true);
 	BOOST_CHECK_EQUAL (test->frames(), 48000);
 	BOOST_CHECK_EQUAL (test->channels(), film->audio_channels ());
@@ -101,4 +103,3 @@ BOOST_AUTO_TEST_CASE (player_silence_padding_test)
 		}
 	}
 }
-