Fix length of player output so it can be either the film's length or playlist's length, as appropriate.

11 files changed, 24 insertions, 24 deletions

diff --git a/test/butler_test.cc b/test/butler_test.cc
index 7aeba78f9..13efc3131 100644
--- a/test/butler_test.cc
+++ b/test/butler_test.cc
@@ -52,7 +52,7 @@ BOOST_AUTO_TEST_CASE (butler_test1)
 		map.set (i, i, 1);
 	}
 
-	Butler butler (shared_ptr<Player>(new Player(film, film->playlist())), map, 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, false);
+	Butler butler (shared_ptr<Player>(new Player(film, film->playlist(), film->length())), map, 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, false);
 
 	BOOST_CHECK (butler.get_video(true, 0).second == DCPTime());
 	BOOST_CHECK (butler.get_video(true, 0).second == DCPTime::from_frames(1, 24));
diff --git a/test/dcp_decoder_test.cc b/test/dcp_decoder_test.cc
index 32eed9354..36df09834 100644
--- a/test/dcp_decoder_test.cc
+++ b/test/dcp_decoder_test.cc
@@ -89,7 +89,7 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test)
 	ov_content.reset (new DCPContent(ov->dir(ov->dcp_name(false))));
 	test->examine_and_add_content (ov_content);
 	BOOST_REQUIRE (!wait_for_jobs());
-	shared_ptr<Player> player (new Player(test, test->playlist()));
+	shared_ptr<Player> player (new Player(test, test->playlist(), test->length()));
 
 	shared_ptr<DCPDecoder> decoder = boost::dynamic_pointer_cast<DCPDecoder>(player->_pieces.front()->decoder);
 	BOOST_REQUIRE (decoder);
@@ -107,7 +107,7 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test)
 	shared_ptr<DCPContent> vf_content (new DCPContent(vf->dir(vf->dcp_name(false))));
 	test->examine_and_add_content (vf_content);
 	BOOST_REQUIRE (!wait_for_jobs());
-	player.reset (new Player(test, test->playlist()));
+	player.reset (new Player(test, test->playlist(), test->length()));
 
 	decoder = boost::dynamic_pointer_cast<DCPDecoder>(player->_pieces.front()->decoder);
 	BOOST_REQUIRE (decoder);
@@ -125,7 +125,7 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test)
 	shared_ptr<DCPContent> encrypted_content (new DCPContent(encrypted->dir(encrypted->dcp_name(false))));
 	test->examine_and_add_content (encrypted_content);
 	BOOST_REQUIRE (!wait_for_jobs());
-	player.reset (new Player(test, test->playlist()));
+	player.reset (new Player(test, test->playlist(), test->length()));
 
 	decoder = boost::dynamic_pointer_cast<DCPDecoder>(player->_pieces.front()->decoder);
 	BOOST_REQUIRE (decoder);
diff --git a/test/dcp_playback_test.cc b/test/dcp_playback_test.cc
index 787857375..e8d916487 100644
--- a/test/dcp_playback_test.cc
+++ b/test/dcp_playback_test.cc
@@ -40,7 +40,7 @@ BOOST_AUTO_TEST_CASE (dcp_playback_test)
 
 	shared_ptr<Butler> butler (
 		new Butler(
-			shared_ptr<Player>(new Player(film, film->playlist())),
+			shared_ptr<Player>(new Player(film, film->playlist(), film->length())),
 			AudioMapping(6, 6),
 			6,
 			bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24),
diff --git a/test/empty_test.cc b/test/empty_test.cc
index 1a4d03300..029e83966 100644
--- a/test/empty_test.cc
+++ b/test/empty_test.cc
@@ -62,7 +62,7 @@ BOOST_AUTO_TEST_CASE (empty_test1)
 	contentB->video->set_length (1);
 	contentB->set_position (film, DCPTime::from_frames (7, vfr));
 
-	Empty black (film, film->playlist(), bind(&has_video, _1));
+	Empty black (film, film->playlist(), bind(&has_video, _1), film->playlist()->length(film));
 	BOOST_REQUIRE_EQUAL (black._periods.size(), 2);
 	list<dcpomatic::DCPTimePeriod>::const_iterator i = black._periods.begin();
 	BOOST_CHECK (i->from == DCPTime::from_frames(0, vfr));
@@ -96,7 +96,7 @@ BOOST_AUTO_TEST_CASE (empty_test2)
 	contentB->video->set_length (1);
 	contentB->set_position (film, DCPTime::from_frames(7, vfr));
 
-	Empty black (film, film->playlist(), bind(&has_video, _1));
+	Empty black (film, film->playlist(), bind(&has_video, _1), film->playlist()->length(film));
 	BOOST_REQUIRE_EQUAL (black._periods.size(), 1);
 	BOOST_CHECK (black._periods.front().from == DCPTime::from_frames(3, vfr));
 	BOOST_CHECK (black._periods.front().to == DCPTime::from_frames(7, vfr));
@@ -138,7 +138,7 @@ BOOST_AUTO_TEST_CASE (empty_test3)
 
 	shared_ptr<Playlist> playlist (new Playlist);
 	playlist->add (film, contentB);
-	Empty black (film, playlist, bind(&has_video, _1));
+	Empty black (film, playlist, bind(&has_video, _1), playlist->length(film));
 	BOOST_REQUIRE_EQUAL (black._periods.size(), 1);
 	BOOST_CHECK (black._periods.front().from == DCPTime::from_frames(0, vfr));
 	BOOST_CHECK (black._periods.front().to == DCPTime::from_frames(7, vfr));
diff --git a/test/ffmpeg_audio_only_test.cc b/test/ffmpeg_audio_only_test.cc
index a8a7184c4..df32cadd4 100644
--- a/test/ffmpeg_audio_only_test.cc
+++ b/test/ffmpeg_audio_only_test.cc
@@ -92,7 +92,7 @@ test (boost::filesystem::path file)
 	ref_buffer_size = info.samplerate * info.channels;
 	ref_buffer = new float[ref_buffer_size];
 
-	shared_ptr<Player> player (new Player (film, film->playlist ()));
+	shared_ptr<Player> player (new Player(film, film->playlist(), film->length()));
 
 	player->Audio.connect (bind (&audio, _1, info.channels));
 	while (!player->pass ()) {}
diff --git a/test/ffmpeg_audio_test.cc b/test/ffmpeg_audio_test.cc
index 8e0fd9280..7a9aaf346 100644
--- a/test/ffmpeg_audio_test.cc
+++ b/test/ffmpeg_audio_test.cc
@@ -134,7 +134,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test2)
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs ());
 
-	shared_ptr<Player> player (new Player (film, film->playlist ()));
+	shared_ptr<Player> player (new Player(film, film->playlist(), film->length()));
 	while (!player->pass ()) {}
 }
 
@@ -146,7 +146,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test3)
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs ());
 
-	shared_ptr<Player> player (new Player (film, film->playlist ()));
+	shared_ptr<Player> player (new Player(film, film->playlist(), film->length()));
 	player->set_fast ();
 	while (!player->pass ()) {}
 }
diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc
index cf841bcab..041d976fe 100644
--- a/test/ffmpeg_decoder_sequential_test.cc
+++ b/test/ffmpeg_decoder_sequential_test.cc
@@ -65,7 +65,7 @@ ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs());
 	film->write_metadata ();
-	shared_ptr<Player> player (new Player (film, film->playlist()));
+	shared_ptr<Player> player (new Player(film, film->playlist(), film->length()));
 
 	BOOST_REQUIRE (content->video_frame_rate());
 	BOOST_CHECK_CLOSE (content->video_frame_rate().get(), fps, 0.01);
diff --git a/test/player_test.cc b/test/player_test.cc
index a242d620b..378e0af9b 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 ()));
+	shared_ptr<Player> player (new Player(film, film->playlist(), film->length()));
 	player->Audio.connect (bind (&accumulate, _1, _2));
 	while (!player->pass ()) {}
 	BOOST_REQUIRE (accumulated->frames() >= 48000);
@@ -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 ()));
+	shared_ptr<Player> player (new Player(film, film->playlist(), film->length()));
 	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()));
+	shared_ptr<Player> player (new Player(film, film->playlist(), film->length()));
 	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()));
+	shared_ptr<Player> player (new Player(film, film->playlist(), film->length()));
 	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()));
+	shared_ptr<Player> player (new Player(film, film->playlist(), film->length()));
 	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()));
+	shared_ptr<Player> player (new Player(film, film->playlist(), film->length()));
 	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()));
+	shared_ptr<Player> player (new Player(film, film->playlist(), film->length()));
 	player->set_fast ();
 	shared_ptr<Butler> butler (new Butler(player, AudioMapping(), 6, bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true));
 
diff --git a/test/time_calculation_test.cc b/test/time_calculation_test.cc
index 968138f96..f6412d9de 100644
--- a/test/time_calculation_test.cc
+++ b/test/time_calculation_test.cc
@@ -190,7 +190,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	film->set_sequence (false);
 	film->add_content (content);
 
-	shared_ptr<Player> player (new Player (film, film->playlist ()));
+	shared_ptr<Player> player (new Player(film, film->playlist(), film->length()));
 
 	/* Position 0, no trim, content rate = DCP rate */
 	content->set_position (film, DCPTime());
@@ -396,7 +396,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 	film->set_sequence (false);
 	film->add_content (content);
 
-	shared_ptr<Player> player (new Player (film, film->playlist ()));
+	shared_ptr<Player> player (new Player(film, film->playlist(), film->length()));
 
 	/* Position 0, no trim, content rate = DCP rate */
 	content->set_position (film, DCPTime());
@@ -573,7 +573,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 	film->set_sequence (false);
 	film->add_content (content);
 
-	shared_ptr<Player> player (new Player (film, film->playlist ()));
+	shared_ptr<Player> player (new Player(film, film->playlist(), film->length()));
 
 	/* Position 0, no trim, video/audio content rate = video/audio DCP rate */
 	content->set_position (film, DCPTime());
diff --git a/test/upmixer_a_test.cc b/test/upmixer_a_test.cc
index 545f081ba..a00a77add 100644
--- a/test/upmixer_a_test.cc
+++ b/test/upmixer_a_test.cc
@@ -79,7 +79,7 @@ BOOST_AUTO_TEST_CASE (upmixer_a_test)
 	Ls = sf_open ("build/test/upmixer_a_test/Ls.wav", SFM_WRITE, &info);
 	Rs = sf_open ("build/test/upmixer_a_test/Rs.wav", SFM_WRITE, &info);
 
-	shared_ptr<Player> player (new Player (film, film->playlist ()));
+	shared_ptr<Player> player (new Player(film, film->playlist(), film->length()));
 	player->Audio.connect (bind (&write, _1, _2));
 	while (!player->pass()) {}
 
diff --git a/test/vf_test.cc b/test/vf_test.cc
index 8cbf7a345..35c32e603 100644
--- a/test/vf_test.cc
+++ b/test/vf_test.cc
@@ -287,7 +287,7 @@ BOOST_AUTO_TEST_CASE (vf_test5)
 	BOOST_REQUIRE (!wait_for_jobs());
 
 	/* Check that the selected reel assets are right */
-	shared_ptr<Player> player (new Player(vf, vf->playlist()));
+	shared_ptr<Player> player (new Player(vf, vf->playlist(), vf->length()));
 	list<ReferencedReelAsset> a = player->get_reel_assets();
 	BOOST_REQUIRE_EQUAL (a.size(), 4);
 	list<ReferencedReelAsset>::const_iterator i = a.begin();