Pass tolerant flag into Player.

This is needed because the DCPDecoder ends up needing it when it reads
reel information from CPLs.

Maybe all that stuff should be in our metadata.

17 files changed, 36 insertions, 36 deletions

diff --git a/test/2536_regression_test.cc b/test/2536_regression_test.cc
index 9f74ffd09..955487724 100644
--- a/test/2536_regression_test.cc
+++ b/test/2536_regression_test.cc
@@ -69,7 +69,7 @@ BOOST_AUTO_TEST_CASE(crash_rendering_vf_interop_subs_test)
 	auto test = new_test_film(prefix + "_test", { vf_dcp });
 	vf_dcp->text[0]->set_use(true);
 
-	auto player = make_shared<Player>(test, Image::Alignment::COMPACT);
+	auto player = make_shared<Player>(test, Image::Alignment::COMPACT, false);
 	player->set_always_burn_open_subtitles();
 	while (!player->pass()) {}
 }
diff --git a/test/butler_test.cc b/test/butler_test.cc
index f7c307e3c..b95aed4df 100644
--- a/test/butler_test.cc
+++ b/test/butler_test.cc
@@ -51,7 +51,7 @@ BOOST_AUTO_TEST_CASE (butler_test1)
 		map.set (i, i, 1);
 	}
 
-	Player player(film, Image::Alignment::COMPACT);
+	Player player(film, Image::Alignment::COMPACT, false);
 
 	Butler butler (
 		film,
@@ -98,7 +98,7 @@ BOOST_AUTO_TEST_CASE (butler_test2)
 		map.set (i, i, 1);
 	}
 
-	Player player(film, Image::Alignment::COMPACT);
+	Player player(film, Image::Alignment::COMPACT, false);
 
 	Butler butler (
 		film,
diff --git a/test/dcp_decoder_test.cc b/test/dcp_decoder_test.cc
index fcecb82e4..cf8366919 100644
--- a/test/dcp_decoder_test.cc
+++ b/test/dcp_decoder_test.cc
@@ -82,7 +82,7 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test)
 	ov_content = make_shared<DCPContent>(ov->dir(ov->dcp_name(false)));
 	test->examine_and_add_content (ov_content);
 	BOOST_REQUIRE (!wait_for_jobs());
-	auto player = make_shared<Player>(test, Image::Alignment::COMPACT);
+	auto player = make_shared<Player>(test, Image::Alignment::COMPACT, false);
 
 	auto decoder = std::dynamic_pointer_cast<DCPDecoder>(player->_pieces.front()->decoder);
 	BOOST_REQUIRE (decoder);
@@ -100,7 +100,7 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test)
 	auto vf_content = make_shared<DCPContent>(vf->dir(vf->dcp_name(false)));
 	test->examine_and_add_content (vf_content);
 	BOOST_REQUIRE (!wait_for_jobs());
-	player = make_shared<Player>(test, Image::Alignment::COMPACT);
+	player = make_shared<Player>(test, Image::Alignment::COMPACT, false);
 
 	decoder = std::dynamic_pointer_cast<DCPDecoder>(player->_pieces.front()->decoder);
 	BOOST_REQUIRE (decoder);
@@ -118,7 +118,7 @@ BOOST_AUTO_TEST_CASE (check_reuse_old_data_test)
 	auto encrypted_content = make_shared<DCPContent>(encrypted->dir(encrypted->dcp_name(false)));
 	test->examine_and_add_content (encrypted_content);
 	BOOST_REQUIRE (!wait_for_jobs());
-	player = make_shared<Player>(test, Image::Alignment::COMPACT);
+	player = make_shared<Player>(test, Image::Alignment::COMPACT, false);
 
 	decoder = std::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 3b08f998c..c63c3c092 100644
--- a/test/dcp_playback_test.cc
+++ b/test/dcp_playback_test.cc
@@ -41,7 +41,7 @@ BOOST_AUTO_TEST_CASE (dcp_playback_test)
 	auto content = make_shared<DCPContent>(TestPaths::private_data() / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV");
 	auto film = new_test_film("dcp_playback_test", { content });
 
-	Player player(film, Image::Alignment::PADDED);
+	Player player(film, Image::Alignment::PADDED, false);
 
 	auto butler = std::make_shared<Butler>(
 		film,
diff --git a/test/ffmpeg_audio_only_test.cc b/test/ffmpeg_audio_only_test.cc
index d994de91b..6d43debcf 100644
--- a/test/ffmpeg_audio_only_test.cc
+++ b/test/ffmpeg_audio_only_test.cc
@@ -95,7 +95,7 @@ test (boost::filesystem::path file)
 	BOOST_REQUIRE_EQUAL (info.samplerate, 48000);
 	ref_buffer.resize(info.samplerate * info.channels);
 
-	auto player = make_shared<Player>(film, Image::Alignment::COMPACT);
+	auto player = make_shared<Player>(film, Image::Alignment::COMPACT, false);
 
 	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 0248b5e40..a106b7dde 100644
--- a/test/ffmpeg_audio_test.cc
+++ b/test/ffmpeg_audio_test.cc
@@ -104,7 +104,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test2)
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs ());
 
-	auto player = make_shared<Player>(film, Image::Alignment::COMPACT);
+	auto player = make_shared<Player>(film, Image::Alignment::COMPACT, false);
 	while (!player->pass ()) {}
 }
 
@@ -117,7 +117,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test3)
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs ());
 
-	auto player = make_shared<Player>(film, Image::Alignment::COMPACT);
+	auto player = make_shared<Player>(film, Image::Alignment::COMPACT, false);
 	player->set_fast ();
 	while (!player->pass ()) {}
 }
@@ -131,7 +131,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_audio_test4)
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs ());
 
-	auto player = make_shared<Player>(film, Image::Alignment::COMPACT);
+	auto player = make_shared<Player>(film, Image::Alignment::COMPACT, false);
 	player->set_fast ();
 	BOOST_CHECK_NO_THROW (while (!player->pass()) {});
 }
diff --git a/test/ffmpeg_decoder_error_test.cc b/test/ffmpeg_decoder_error_test.cc
index b53eabac5..1d3896618 100644
--- a/test/ffmpeg_decoder_error_test.cc
+++ b/test/ffmpeg_decoder_error_test.cc
@@ -53,7 +53,7 @@ BOOST_AUTO_TEST_CASE (check_exception_with_multiple_video_frames_per_packet)
 {
 	auto content = content_factory(TestPaths::private_data() / "chk.mkv")[0];
 	auto film = new_test_film("check_exception_with_multiple_video_frames_per_packet", { content });
-	auto player = std::make_shared<Player>(film, film->playlist());
+	auto player = std::make_shared<Player>(film, film->playlist(), false);
 
 	while (!player->pass()) {}
 }
diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc
index c0fe26ea3..43ef3eb68 100644
--- a/test/ffmpeg_decoder_sequential_test.cc
+++ b/test/ffmpeg_decoder_sequential_test.cc
@@ -72,7 +72,7 @@ ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int
 
 	auto content = make_shared<FFmpegContent>(path);
 	auto film = new_test_film("ffmpeg_decoder_sequential_test_" + file.string(), { content });
-	auto player = make_shared<Player>(film, Image::Alignment::COMPACT);
+	auto player = make_shared<Player>(film, Image::Alignment::COMPACT, false);
 
 	BOOST_REQUIRE (content->video_frame_rate());
 	BOOST_CHECK_CLOSE (content->video_frame_rate().get(), fps, 0.01);
diff --git a/test/ffmpeg_subtitles_test.cc b/test/ffmpeg_subtitles_test.cc
index da63063cb..b7f81ff41 100644
--- a/test/ffmpeg_subtitles_test.cc
+++ b/test/ffmpeg_subtitles_test.cc
@@ -43,7 +43,7 @@ BOOST_AUTO_TEST_CASE(decoding_ssa_subs_from_mkv)
 
 	vector<string> lines;
 
-	auto player = make_shared<Player>(film, film->playlist());
+	auto player = make_shared<Player>(film, film->playlist(), false);
 	player->Text.connect([&lines](PlayerText text, TextType, optional<DCPTextTrack>, dcpomatic::DCPTimePeriod) {
 		for (auto i: text.string) {
 			lines.push_back(i.text());
diff --git a/test/overlap_video_test.cc b/test/overlap_video_test.cc
index 01d7a9fcb..33a0bf8bd 100644
--- a/test/overlap_video_test.cc
+++ b/test/overlap_video_test.cc
@@ -66,7 +66,7 @@ BOOST_AUTO_TEST_CASE (overlap_video_test1)
 	B->set_position(film, dcpomatic::DCPTime::from_seconds(1));
 	C->set_position(film, dcpomatic::DCPTime::from_seconds(3));
 
-	auto player = make_shared<Player>(film, Image::Alignment::COMPACT);
+	auto player = make_shared<Player>(film, Image::Alignment::COMPACT, false);
 	auto pieces = player->_pieces;
 	BOOST_REQUIRE_EQUAL (pieces.size(), 3U);
 	BOOST_CHECK_EQUAL(pieces[0]->content, A);
diff --git a/test/player_test.cc b/test/player_test.cc
index cac5dffe9..eb49bc4df 100644
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -84,7 +84,7 @@ BOOST_AUTO_TEST_CASE (player_silence_padding_test)
 
 	accumulated = std::make_shared<AudioBuffers>(film->audio_channels(), 0);
 
-	Player player(film, Image::Alignment::COMPACT);
+	Player player(film, Image::Alignment::COMPACT, false);
 	player.Audio.connect(bind(&accumulate, _1, _2));
 	while (!player.pass()) {}
 	BOOST_REQUIRE (accumulated->frames() >= 48000);
@@ -154,7 +154,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));
 
-	Player player(film, Image::Alignment::COMPACT);
+	Player player(film, Image::Alignment::COMPACT, false);
 	player.setup_pieces();
 	BOOST_REQUIRE_EQUAL(player._black._periods.size(), 1U);
 	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)
 	auto film = new_test_film("ffmpeg_transcoder_basic_test_subs", { c, s });
 	film->set_audio_channels (6);
 
-	Player player(film, Image::Alignment::COMPACT);
+	Player player(film, Image::Alignment::COMPACT, false);
 	player.Video.connect(bind(&video, _1, _2));
 	player.Audio.connect(bind(&audio, _1, _2));
 	video_frames = audio_frames = 0;
@@ -211,7 +211,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test)
 	BOOST_REQUIRE (!wait_for_jobs ());
 	dcp->only_text()->set_use (true);
 
-	Player player(film, Image::Alignment::COMPACT);
+	Player player(film, Image::Alignment::COMPACT, false);
 	player.set_fast();
 	player.set_always_burn_open_subtitles();
 	player.set_play_referenced();
@@ -244,7 +244,7 @@ BOOST_AUTO_TEST_CASE (player_seek_test2)
 	BOOST_REQUIRE (!wait_for_jobs ());
 	dcp->only_text()->set_use (true);
 
-	Player player(film, Image::Alignment::COMPACT);
+	Player player(film, Image::Alignment::COMPACT, false);
 	player.set_fast();
 	player.set_always_burn_open_subtitles();
 	player.set_play_referenced();
@@ -319,7 +319,7 @@ BOOST_AUTO_TEST_CASE (player_ignore_video_and_audio_test)
 	text->only_text()->set_type (TextType::CLOSED_CAPTION);
 	text->only_text()->set_use (true);
 
-	Player player(film, Image::Alignment::COMPACT);
+	Player player(film, Image::Alignment::COMPACT, false);
 	player.set_ignore_video();
 	player.set_ignore_audio();
 
@@ -339,7 +339,7 @@ BOOST_AUTO_TEST_CASE (player_trim_crash)
 	film->examine_and_add_content (boon);
 	BOOST_REQUIRE (!wait_for_jobs());
 
-	Player player(film, Image::Alignment::COMPACT);
+	Player player(film, Image::Alignment::COMPACT, false);
 	player.set_fast();
 	auto butler = std::make_shared<Butler>(
 		film, player, AudioMapping(), 6, bind(&PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::COMPACT, true, false, Butler::Audio::ENABLED
@@ -472,7 +472,7 @@ BOOST_AUTO_TEST_CASE (encrypted_dcp_with_no_kdm_gives_no_butler_error)
 	auto content2 = std::make_shared<DCPContent>(film->dir(film->dcp_name()));
 	auto film2 = new_test_film("encrypted_dcp_with_no_kdm_gives_no_butler_error2", { content2 });
 
-	Player player(film, Image::Alignment::COMPACT);
+	Player player(film, Image::Alignment::COMPACT, false);
 	Butler butler(film2, player, AudioMapping(), 2, bind(PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::PADDED, true, false, Butler::Audio::ENABLED);
 
 	float buffer[2000 * 6];
@@ -510,7 +510,7 @@ BOOST_AUTO_TEST_CASE (interleaved_subtitle_are_emitted_correctly)
 	subs1->set_position(film, DCPTime());
 	subs2->set_position(film, DCPTime());
 
-	Player player(film, Image::Alignment::COMPACT);
+	Player player(film, Image::Alignment::COMPACT, false);
 	dcp::Time last;
 	player.Text.connect([&last](PlayerText text, TextType, optional<DCPTextTrack>, dcpomatic::DCPTimePeriod) {
 		for (auto sub: text.string) {
@@ -595,7 +595,7 @@ BOOST_AUTO_TEST_CASE(two_d_in_three_d_duplicates)
 	B->set_position(film, DCPTime::from_seconds(10));
 	B->video->set_custom_size(dcp::Size(1998, 1080));
 
-	auto player = std::make_shared<Player>(film, film->playlist());
+	auto player = std::make_shared<Player>(film, film->playlist(), false);
 
 	std::vector<uint8_t> red_line(1998 * 3);
 	for (int i = 0; i < 1998; ++i) {
@@ -651,7 +651,7 @@ BOOST_AUTO_TEST_CASE(three_d_in_two_d_chooses_left)
 
 	mono->set_position(film, dcpomatic::DCPTime::from_seconds(10));
 
-	auto player = std::make_shared<Player>(film, film->playlist());
+	auto player = std::make_shared<Player>(film, film->playlist(), false);
 
 	std::vector<uint8_t> red_line(1998 * 3);
 	for (int i = 0; i < 1998; ++i) {
@@ -690,7 +690,7 @@ BOOST_AUTO_TEST_CASE(check_seek_with_no_video)
 {
 	auto content = content_factory(TestPaths::private_data() / "Fight.Club.1999.720p.BRRip.x264-x0r.srt")[0];
 	auto film = new_test_film("check_seek_with_no_video", { content });
-	auto player = std::make_shared<Player>(film, film->playlist());
+	auto player = std::make_shared<Player>(film, film->playlist(), false);
 
 	boost::signals2::signal<void (std::shared_ptr<PlayerVideo>, dcpomatic::DCPTime)> Video;
 
@@ -721,7 +721,7 @@ BOOST_AUTO_TEST_CASE(unmapped_audio_does_not_raise_buffer_error)
 
 	content->audio->set_mapping(AudioMapping(6 * 2, MAX_DCP_AUDIO_CHANNELS));
 
-	Player player(film, Image::Alignment::COMPACT);
+	Player player(film, Image::Alignment::COMPACT, false);
 	Butler butler(film, player, AudioMapping(), 2, bind(PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::PADDED, true, false, Butler::Audio::ENABLED);
 
 	/* Wait for the butler thread to run for a while; in the case under test it will throw an exception because
diff --git a/test/subtitle_font_id_test.cc b/test/subtitle_font_id_test.cc
index b358e7d3e..4c0204b69 100644
--- a/test/subtitle_font_id_test.cc
+++ b/test/subtitle_font_id_test.cc
@@ -299,7 +299,7 @@ BOOST_AUTO_TEST_CASE(no_error_with_ccap_that_mentions_no_font)
 {
 	auto dcp = make_shared<DCPContent>("test/data/ccap_only");
 	auto film = new_test_film("no_error_with_ccap_that_mentions_no_font", { dcp });
-	auto player = Player(film, film->playlist());
+	auto player = Player(film, film->playlist(), false);
 	while (!player.pass()) {}
 }
 
diff --git a/test/threed_test.cc b/test/threed_test.cc
index 27dd12cbe..0df7d9d20 100644
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -268,7 +268,7 @@ BOOST_AUTO_TEST_CASE (threed_test_butler_overfill)
 	film->examine_and_add_content(B);
 	BOOST_REQUIRE (!wait_for_jobs());
 
-	Player player(film, Image::Alignment::COMPACT);
+	Player player(film, Image::Alignment::COMPACT, false);
 	int const audio_channels = 2;
 	auto butler = std::make_shared<Butler>(
 		film, player, AudioMapping(), audio_channels, boost::bind(PlayerVideo::force, AV_PIX_FMT_RGB24), VideoRange::FULL, Image::Alignment::PADDED, true, false, Butler::Audio::ENABLED
diff --git a/test/time_calculation_test.cc b/test/time_calculation_test.cc
index 6c2b92a39..386e50e25 100644
--- a/test/time_calculation_test.cc
+++ b/test/time_calculation_test.cc
@@ -196,7 +196,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1)
 	film->set_sequence (false);
 	film->add_content (content);
 
-	auto player = make_shared<Player>(film, Image::Alignment::COMPACT);
+	auto player = make_shared<Player>(film, Image::Alignment::COMPACT, false);
 
 	/* Position 0, no trim, content rate = DCP rate */
 	content->set_position (film, DCPTime());
@@ -402,7 +402,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2)
 	film->set_sequence (false);
 	film->add_content (content);
 
-	auto player = make_shared<Player>(film, Image::Alignment::COMPACT);
+	auto player = make_shared<Player>(film, Image::Alignment::COMPACT, false);
 
 	/* Position 0, no trim, content rate = DCP rate */
 	content->set_position (film, DCPTime());
@@ -579,7 +579,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3)
 	film->set_sequence (false);
 	film->add_content (content);
 
-	auto player = make_shared<Player>(film, Image::Alignment::COMPACT);
+	auto player = make_shared<Player>(film, Image::Alignment::COMPACT, false);
 
 	/* 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 29af9805b..4ab40563a 100644
--- a/test/upmixer_a_test.cc
+++ b/test/upmixer_a_test.cc
@@ -83,7 +83,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);
 
-	auto player = make_shared<Player>(film, Image::Alignment::COMPACT);
+	auto player = make_shared<Player>(film, Image::Alignment::COMPACT, false);
 	player->Audio.connect (bind (&write, _1, _2));
 	while (!player->pass()) {}
 
diff --git a/test/video_level_test.cc b/test/video_level_test.cc
index f210f2add..91deb9b9b 100644
--- a/test/video_level_test.cc
+++ b/test/video_level_test.cc
@@ -117,7 +117,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_image_video_range_expanded)
 	auto content = content_factory(file);
 	auto film = new_test_film("ffmpeg_image_video_range_expanded", content);
 	content[0]->video->set_range (VideoRange::VIDEO);
-	auto player = make_shared<Player>(film, film->playlist());
+	auto player = make_shared<Player>(film, film->playlist(), false);
 
 	shared_ptr<PlayerVideo> player_video;
 	player->Video.connect([&player_video](shared_ptr<PlayerVideo> pv, dcpomatic::DCPTime) {
diff --git a/test/video_trim_test.cc b/test/video_trim_test.cc
index c4b24b449..067e81eaf 100644
--- a/test/video_trim_test.cc
+++ b/test/video_trim_test.cc
@@ -42,7 +42,7 @@ BOOST_AUTO_TEST_CASE(video_trim_test)
 
 	shared_ptr<PlayerVideo> first_video;
 
-	auto player = make_shared<Player>(film, Image::Alignment::COMPACT);
+	auto player = make_shared<Player>(film, Image::Alignment::COMPACT, false);
 	player->Video.connect([&first_video](shared_ptr<PlayerVideo> video, dcpomatic::DCPTime) {
 	      first_video = video;
 	});