X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fplayer_test.cc;h=87e7fda8a2ab748c42c322e02f89ca19809d46ca;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=b6f864f8250e9762f0975eb16e6e79b38af8e360;hpb=cb990adba9c57e5107ef2aa9716cf0a26c1df83d;p=dcpomatic.git

diff --git a/test/player_test.cc b/test/player_test.cc
index b6f864f82..87e7fda8a 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"));
@@ -55,26 +57,26 @@ BOOST_AUTO_TEST_CASE (player_overlaps_test)
 	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));
 
 	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));
 	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 ());