X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fplayer_test.cc;h=2e979eb44f5ea0b067972d5b47237ff7810428fe;hb=119bf28caa0e3469128a1f015ee00cdf773039b0;hp=378e0af9b3f8ff44f789465c3e3952e5399f6d43;hpb=4219d4b76c5cd5690b1f4fa0c248d93ced26d05a;p=dcpomatic.git

diff --git a/test/player_test.cc b/test/player_test.cc
index 378e0af9b..2e979eb44 100644
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -74,7 +74,7 @@ BOOST_AUTO_TEST_CASE (player_silence_padding_test)
 
 	accumulated.reset (new AudioBuffers (film->audio_channels(), 0));
 
-	shared_ptr<Player> player (new Player(film, film->playlist(), film->length()));
+	shared_ptr<Player> player (new Player(film));
 	player->Audio.connect (bind (&accumulate, _1, _2));
 	while (!player->pass ()) {}
 	BOOST_REQUIRE (accumulated->frames() >= 48000);
@@ -103,12 +103,12 @@ BOOST_AUTO_TEST_CASE (player_black_fill_test)
 	film->examine_and_add_content (contentB);
 	BOOST_REQUIRE (!wait_for_jobs());
 
-	contentA->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
 	contentA->video->set_length (3);
 	contentA->set_position (film, DCPTime::from_frames(2, film->video_frame_rate()));
-	contentB->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
+	contentA->video->set_custom_ratio (1.85);
 	contentB->video->set_length (1);
 	contentB->set_position (film, DCPTime::from_frames(7, film->video_frame_rate()));
+	contentB->video->set_custom_ratio (1.85);
 
 	film->make_dcp ();
 
@@ -149,7 +149,7 @@ BOOST_AUTO_TEST_CASE (player_subframe_test)
 	/* Length should be rounded up from B's length to the next video frame */
 	BOOST_CHECK (film->length() == DCPTime::from_frames(3 * 24 + 1, 24));
 
-	shared_ptr<Player> player (new Player(film, film->playlist(), film->length()));
+	shared_ptr<Player> player (new Player(film));
 	player->setup_pieces ();
 	BOOST_REQUIRE_EQUAL (player->_black._periods.size(), 1);
 	BOOST_CHECK (player->_black._periods.front() == DCPTimePeriod(DCPTime::from_frames(3 * 24, 24), DCPTime::from_frames(3 * 24 + 1, 24)));
@@ -188,7 +188,7 @@ BOOST_AUTO_TEST_CASE (player_interleave_test)
 	film->examine_and_add_content (s);
 	BOOST_REQUIRE (!wait_for_jobs ());
 
-	shared_ptr<Player> player (new Player(film, film->playlist(), film->length()));
+	shared_ptr<Player> player (new Player(film));
 	player->Video.connect (bind (&video, _1, _2));
 	player->Audio.connect (bind (&audio, _1, _2));
 	video_frames = audio_frames = 0;
@@ -210,7 +210,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test)
 	BOOST_REQUIRE (!wait_for_jobs ());
 	dcp->only_text()->set_use (true);
 
-	shared_ptr<Player> player (new Player(film, film->playlist(), film->length()));
+	shared_ptr<Player> player (new Player(film));
 	player->set_fast ();
 	player->set_always_burn_open_subtitles ();
 	player->set_play_referenced ();
@@ -241,7 +241,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test2)
 	BOOST_REQUIRE (!wait_for_jobs ());
 	dcp->only_text()->set_use (true);
 
-	shared_ptr<Player> player (new Player(film, film->playlist(), film->length()));
+	shared_ptr<Player> player (new Player(film));
 	player->set_fast ();
 	player->set_always_burn_open_subtitles ();
 	player->set_play_referenced ();
@@ -310,7 +310,7 @@ BOOST_AUTO_TEST_CASE (player_ignore_video_and_audio_test)
 	text->only_text()->set_type (TEXT_CLOSED_CAPTION);
 	text->only_text()->set_use (true);
 
-	shared_ptr<Player> player (new Player(film, film->playlist(), film->length()));
+	shared_ptr<Player> player (new Player(film));
 	player->set_ignore_video ();
 	player->set_ignore_audio ();
 
@@ -329,7 +329,7 @@ BOOST_AUTO_TEST_CASE (player_trim_crash)
 	film->examine_and_add_content (boon);
 	BOOST_REQUIRE (!wait_for_jobs());
 
-	shared_ptr<Player> player (new Player(film, film->playlist(), film->length()));
+	shared_ptr<Player> player (new Player(film));
 	player->set_fast ();
 	shared_ptr<Butler> butler (new Butler(player, AudioMapping(), 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true));