Remove now-unnecessary Film parameters.

13 files changed, 66 insertions, 66 deletions

diff --git a/test/atmos_test.cc b/test/atmos_test.cc
index 63da157b5..1aaaccab4 100644
--- a/test/atmos_test.cc
+++ b/test/atmos_test.cc
@@ -101,7 +101,7 @@ BOOST_AUTO_TEST_CASE(atmos_trim_test)
 	auto content = content_factory(TestPaths::private_data() / "atmos_asset.mxf");
 	auto film = new_test_film("atmos_trim_test", content, &cl);
 
-	content[0]->set_trim_start(film, dcpomatic::ContentTime::from_seconds(1));
+	content[0]->set_trim_start(dcpomatic::ContentTime::from_seconds(1));
 
 	/* Just check that the encode runs; I'm not sure how to test the MXF */
 	make_and_verify_dcp(film, { dcp::VerificationNote::Code::MISSING_CPL_METADATA });
diff --git a/test/audio_content_test.cc b/test/audio_content_test.cc
index cc9fad712..1a42f6781 100644
--- a/test/audio_content_test.cc
+++ b/test/audio_content_test.cc
@@ -170,7 +170,7 @@ BOOST_AUTO_TEST_CASE (audio_content_fade_in_with_trim)
 
 	content->audio->set_fade_in(dcpomatic::ContentTime::from_frames(2000, 48000));
 	content->audio->set_fade_out(dcpomatic::ContentTime::from_frames(1000, 48000));
-	content->set_trim_start(film, dcpomatic::ContentTime::from_frames(5200, 48000));
+	content->set_trim_start(dcpomatic::ContentTime::from_frames(5200, 48000));
 
 	/* In the trim */
 	auto const f1 = content->audio->fade(stream, 0, 2000, 48000);
@@ -198,7 +198,7 @@ BOOST_AUTO_TEST_CASE (audio_content_fade_out_with_trim)
 
 	content->audio->set_fade_in(dcpomatic::ContentTime::from_frames(2000, 48000));
 	content->audio->set_fade_out(dcpomatic::ContentTime::from_frames(1000, 48000));
-	content->set_trim_start(film, dcpomatic::ContentTime::from_frames(5200, 48000));
+	content->set_trim_start(dcpomatic::ContentTime::from_frames(5200, 48000));
 	content->set_trim_end(dcpomatic::ContentTime::from_frames(9000, 48000));
 
 	/* In the trim */
diff --git a/test/content_test.cc b/test/content_test.cc
index b6c6703c5..c3a529dd0 100644
--- a/test/content_test.cc
+++ b/test/content_test.cc
@@ -60,7 +60,7 @@ BOOST_AUTO_TEST_CASE (content_test2)
 {
 	auto content = content_factory("test/data/red_23976.mp4")[0];
 	auto film = new_test_film("content_test2", {content});
-	content->set_trim_start(film, ContentTime::from_seconds(0.5));
+	content->set_trim_start(ContentTime::from_seconds(0.5));
 	make_and_verify_dcp (film);
 }
 
@@ -75,15 +75,15 @@ BOOST_AUTO_TEST_CASE (content_test3)
 	/* Trim */
 
 	/* 12 frames */
-	content->set_trim_start(film, ContentTime::from_seconds (12.0 / 24.0));
+	content->set_trim_start(ContentTime::from_seconds (12.0 / 24.0));
 	BOOST_CHECK (content->trim_start() == ContentTime::from_seconds (12.0 / 24.0));
 
 	/* 11.2 frames */
-	content->set_trim_start(film, ContentTime::from_seconds (11.2 / 24.0));
+	content->set_trim_start(ContentTime::from_seconds (11.2 / 24.0));
 	BOOST_CHECK (content->trim_start() == ContentTime::from_seconds (11.0 / 24.0));
 
 	/* 13.9 frames */
-	content->set_trim_start(film, ContentTime::from_seconds (13.9 / 24.0));
+	content->set_trim_start(ContentTime::from_seconds (13.9 / 24.0));
 	BOOST_CHECK (content->trim_start() == ContentTime::from_seconds (14.0 / 24.0));
 
 	/* Position */
diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc
index 3888a7b53..da7f58b77 100644
--- a/test/dcp_subtitle_test.cc
+++ b/test/dcp_subtitle_test.cc
@@ -329,7 +329,7 @@ BOOST_AUTO_TEST_CASE(dcp_subtitle_trim_test)
 {
 	auto content = make_shared<DCPSubtitleContent>("test/data/dcp_sub7.xml");
 	auto film = new_test_film("dcp_subtitle_trim_start_test", { content });
-	content->set_trim_start(film, dcpomatic::ContentTime::from_seconds(10.5));
+	content->set_trim_start(dcpomatic::ContentTime::from_seconds(10.5));
 	content->set_trim_end(dcpomatic::ContentTime::from_seconds(2.5));
 	content->text[0]->set_language(dcp::LanguageTag("en"));
 
diff --git a/test/ffmpeg_decoder_error_test.cc b/test/ffmpeg_decoder_error_test.cc
index 1d3896618..a123a25eb 100644
--- a/test/ffmpeg_decoder_error_test.cc
+++ b/test/ffmpeg_decoder_error_test.cc
@@ -41,7 +41,7 @@ BOOST_AUTO_TEST_CASE (check_exception_during_flush)
 	auto content = content_factory(TestPaths::private_data() / "3d_thx_broadway_2010_lossless.m2ts");
 	auto film = new_test_film("check_exception_during_flush", content);
 
-	content[0]->set_trim_start(film, dcpomatic::ContentTime(2310308));
+	content[0]->set_trim_start(dcpomatic::ContentTime(2310308));
 	content[0]->set_trim_end(dcpomatic::ContentTime(116020));
 
 	make_and_verify_dcp (film);
diff --git a/test/player_test.cc b/test/player_test.cc
index ca81c29f6..cdcc48c52 100644
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -282,7 +282,7 @@ BOOST_AUTO_TEST_CASE (player_trim_test)
        BOOST_REQUIRE (!wait_for_jobs ());
        B->video->set_length (10 * 24);
        B->set_position (film, DCPTime::from_seconds(10));
-       B->set_trim_start(film, ContentTime::from_seconds(2));
+       B->set_trim_start(ContentTime::from_seconds(2));
 
        make_and_verify_dcp (film);
 }
@@ -349,7 +349,7 @@ BOOST_AUTO_TEST_CASE (player_trim_crash)
 	/* Wait for the butler to fill */
 	dcpomatic_sleep_seconds (5);
 
-	boon->set_trim_start(film, ContentTime::from_seconds(5));
+	boon->set_trim_start(ContentTime::from_seconds(5));
 
 	butler->seek (DCPTime(), true);
 
@@ -558,7 +558,7 @@ BOOST_AUTO_TEST_CASE(trimmed_sound_mix_bug_13)
 	A->audio->set_gain(-12);
 	B->set_position(film, DCPTime());
 	B->audio->set_gain(-12);
-	B->set_trim_start(film, ContentTime(13));
+	B->set_trim_start(ContentTime(13));
 
 	make_and_verify_dcp(film, { dcp::VerificationNote::Code::MISSING_CPL_METADATA });
 	check_mxf_audio_file("test/data/trimmed_sound_mix_bug_13.mxf", dcp_file(film, "pcm_"));
@@ -575,7 +575,7 @@ BOOST_AUTO_TEST_CASE(trimmed_sound_mix_bug_13_frame_rate_change)
 	A->audio->set_gain(-12);
 	B->set_position(film, DCPTime());
 	B->audio->set_gain(-12);
-	B->set_trim_start(film, ContentTime(13));
+	B->set_trim_start(ContentTime(13));
 
 	A->set_video_frame_rate(film, 24);
 	B->set_video_frame_rate(film, 24);
@@ -779,8 +779,8 @@ BOOST_AUTO_TEST_CASE(test_fill_audio_at_end)
 {
 	auto content = content_factory(TestPaths::private_data() / "Video Ts-1.m4v");
 	auto film = new_test_film("test_fill_audio_at_end", content);
-	content[0]->set_trim_start(film, ContentTime::from_seconds((60 + 42) * 60));
+	content[0]->set_trim_start(ContentTime::from_seconds((60 + 42) * 60));
 
-	make_and_verify_dcp(film, {});// dcp::VerificationNote::Code::MISSING_CPL_METADATA });
+	make_and_verify_dcp(film, {});
 }
 
diff --git a/test/reels_test.cc b/test/reels_test.cc
index fcb1aee44..e8ef24b82 100644
--- a/test/reels_test.cc
+++ b/test/reels_test.cc
@@ -250,7 +250,7 @@ BOOST_AUTO_TEST_CASE (reels_test5)
 	}
 
 	{
-		dcp->set_trim_start(film, ContentTime::from_seconds(0.5));
+		dcp->set_trim_start(ContentTime::from_seconds(0.5));
 		auto p = dcp->reels (film);
 		BOOST_REQUIRE_EQUAL (p.size(), 4U);
 		auto i = p.begin();
@@ -272,7 +272,7 @@ BOOST_AUTO_TEST_CASE (reels_test5)
 	}
 
 	{
-		dcp->set_trim_start(film, ContentTime::from_seconds(1.5));
+		dcp->set_trim_start(ContentTime::from_seconds(1.5));
 		auto p = dcp->reels (film);
 		BOOST_REQUIRE_EQUAL (p.size(), 3U);
 		auto i = p.begin();
@@ -618,7 +618,7 @@ BOOST_AUTO_TEST_CASE (repeated_dcp_into_reels)
 
 	for (int i = 0; i < 4; ++i) {
 		original_dcp[i]->set_position(film2, DCPTime::from_frames(total_frames * i / 4, frame_rate));
-		original_dcp[i]->set_trim_start(film2, ContentTime::from_frames(total_frames * i / 4, frame_rate));
+		original_dcp[i]->set_trim_start(ContentTime::from_frames(total_frames * i / 4, frame_rate));
 		original_dcp[i]->set_trim_end  (ContentTime::from_frames(total_frames * (4 - i - 1) / 4, frame_rate));
 		original_dcp[i]->set_reference_video(true);
 		original_dcp[i]->set_reference_audio(true);
diff --git a/test/silence_padding_test.cc b/test/silence_padding_test.cc
index a927510fb..772c6163e 100644
--- a/test/silence_padding_test.cc
+++ b/test/silence_padding_test.cc
@@ -137,7 +137,7 @@ BOOST_AUTO_TEST_CASE (silence_padding_test2)
 	auto film = new_test_film("silence_padding_test2", { content }, &cl);
 
 	film->set_video_frame_rate (24);
-	content->set_trim_start(film, dcpomatic::ContentTime(4003));
+	content->set_trim_start(dcpomatic::ContentTime(4003));
 
 	make_and_verify_dcp (film);
 
diff --git a/test/time_calculation_test.cc b/test/time_calculation_test.cc
index c8920a8d4..839e32c8b 100644
--- a/test/time_calculation_test.cc
+++ b/test/time_calculation_test.cc
@@ -201,7 +201,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test1)
 
 	/* Position 0, no trim, content rate = DCP rate */
 	content->set_position(film, DCPTime());
-	content->set_trim_start(film, ContentTime());
+	content->set_trim_start(ContentTime());
 	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate(24);
 	player->setup_pieces();
@@ -213,7 +213,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test1)
 
 	/* Position 3s, no trim, content rate = DCP rate */
 	content->set_position(film, DCPTime::from_seconds(3));
-	content->set_trim_start(film, ContentTime());
+	content->set_trim_start(ContentTime());
 	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate(24);
 	player->setup_pieces();
@@ -227,7 +227,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test1)
 
 	/* Position 3s, 1.5s trim, content rate = DCP rate */
 	content->set_position(film, DCPTime::from_seconds(3));
-	content->set_trim_start(film, ContentTime::from_seconds(1.5));
+	content->set_trim_start(ContentTime::from_seconds(1.5));
 	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate(24);
 	player->setup_pieces();
@@ -244,7 +244,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test1)
 	   fast (at 25fps) in this case, this means 75 frames of content video will be used.
 	*/
 	content->set_position(film, DCPTime());
-	content->set_trim_start(film, ContentTime());
+	content->set_trim_start(ContentTime());
 	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate(25);
 	player->setup_pieces();
@@ -256,7 +256,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test1)
 
 	/* Position 3s, no trim, content rate 24, DCP rate 25 */
 	content->set_position(film, DCPTime::from_seconds(3));
-	content->set_trim_start(film, ContentTime());
+	content->set_trim_start(ContentTime());
 	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate(25);
 	player->setup_pieces();
@@ -273,7 +273,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test1)
 	   some of these results are not quite what you'd perhaps expect.
 	 */
 	content->set_position(film, DCPTime::from_seconds(3));
-	content->set_trim_start(film, ContentTime::from_seconds(1.6));
+	content->set_trim_start(ContentTime::from_seconds(1.6));
 	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate(25);
 	player->setup_pieces();
@@ -292,7 +292,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test1)
 	   content rate = DCP rate case.
 	*/
 	content->set_position(film, DCPTime());
-	content->set_trim_start(film, ContentTime());
+	content->set_trim_start(ContentTime());
 	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate(48);
 	player->setup_pieces();
@@ -304,7 +304,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test1)
 
 	/* Position 3s, no trim, content rate 24, DCP rate 48 */
 	content->set_position(film, DCPTime::from_seconds(3));
-	content->set_trim_start(film, ContentTime());
+	content->set_trim_start(ContentTime());
 	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate(48);
 	player->setup_pieces();
@@ -318,7 +318,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test1)
 
 	/* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
 	content->set_position(film, DCPTime::from_seconds(3));
-	content->set_trim_start(film, ContentTime::from_seconds(1.5));
+	content->set_trim_start(ContentTime::from_seconds(1.5));
 	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate(48);
 	player->setup_pieces();
@@ -336,7 +336,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test1)
 	   be used to make 3 * 24 frames of DCP video.
 	*/
 	content->set_position(film, DCPTime());
-	content->set_trim_start(film, ContentTime());
+	content->set_trim_start(ContentTime());
 	content->set_video_frame_rate(film, 48);
 	film->set_video_frame_rate(24);
 	player->setup_pieces();
@@ -348,7 +348,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test1)
 
 	/* Position 3s, no trim, content rate 24, DCP rate 48 */
 	content->set_position(film, DCPTime::from_seconds(3));
-	content->set_trim_start(film, ContentTime());
+	content->set_trim_start(ContentTime());
 	content->set_video_frame_rate(film, 48);
 	film->set_video_frame_rate(24);
 	player->setup_pieces();
@@ -362,7 +362,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test1)
 
 	/* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
 	content->set_position(film, DCPTime::from_seconds(3));
-	content->set_trim_start(film, ContentTime::from_seconds(1.5));
+	content->set_trim_start(ContentTime::from_seconds(1.5));
 	content->set_video_frame_rate(film, 48);
 	film->set_video_frame_rate(24);
 	player->setup_pieces();
@@ -376,7 +376,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test1)
 
 	/* Position 0s, no trim, content rate 29.9978733, DCP rate 30 */
 	content->set_position(film, DCPTime::from_seconds(0));
-	content->set_trim_start(film, ContentTime::from_seconds(0));
+	content->set_trim_start(ContentTime::from_seconds(0));
 	content->set_video_frame_rate(film, 29.9978733);
 	film->set_video_frame_rate(30);
 	player->setup_pieces();
@@ -407,7 +407,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test2)
 
 	/* Position 0, no trim, content rate = DCP rate */
 	content->set_position(film, DCPTime());
-	content->set_trim_start(film, ContentTime());
+	content->set_trim_start(ContentTime());
 	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate(24);
 	player->setup_pieces();
@@ -419,7 +419,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test2)
 
 	/* Position 3s, no trim, content rate = DCP rate */
 	content->set_position(film, DCPTime::from_seconds(3));
-	content->set_trim_start(film, ContentTime());
+	content->set_trim_start(ContentTime());
 	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate(24);
 	player->setup_pieces();
@@ -431,7 +431,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test2)
 
 	/* Position 3s, 1.5s trim, content rate = DCP rate */
 	content->set_position(film, DCPTime::from_seconds(3));
-	content->set_trim_start(film, ContentTime::from_seconds(1.5));
+	content->set_trim_start(ContentTime::from_seconds(1.5));
 	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate(24);
 	player->setup_pieces();
@@ -447,7 +447,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test2)
 	   fast (at 25fps) in this case, this means 75 frames of content video will be used.
 	*/
 	content->set_position(film, DCPTime());
-	content->set_trim_start(film, ContentTime());
+	content->set_trim_start(ContentTime());
 	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate(25);
 	player->setup_pieces();
@@ -459,7 +459,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test2)
 
 	/* Position 3s, no trim, content rate 24, DCP rate 25 */
 	content->set_position(film, DCPTime::from_seconds(3));
-	content->set_trim_start(film, ContentTime());
+	content->set_trim_start(ContentTime());
 	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate(25);
 	player->setup_pieces();
@@ -471,7 +471,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test2)
 
 	/* Position 3s, 1.6s trim, content rate 24, DCP rate 25, so the 1.6s trim is at 24fps */
 	content->set_position(film, DCPTime::from_seconds(3));
-	content->set_trim_start(film, ContentTime::from_seconds(1.6));
+	content->set_trim_start(ContentTime::from_seconds(1.6));
 	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate(25);
 	player->setup_pieces();
@@ -489,7 +489,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test2)
 	   content rate = DCP rate case.
 	*/
 	content->set_position(film, DCPTime());
-	content->set_trim_start(film, ContentTime());
+	content->set_trim_start(ContentTime());
 	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate(48);
 	player->setup_pieces();
@@ -501,7 +501,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test2)
 
 	/* Position 3s, no trim, content rate 24, DCP rate 48 */
 	content->set_position(film, DCPTime::from_seconds(3));
-	content->set_trim_start(film, ContentTime());
+	content->set_trim_start(ContentTime());
 	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate(48);
 	player->setup_pieces();
@@ -513,7 +513,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test2)
 
 	/* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
 	content->set_position(film, DCPTime::from_seconds(3));
-	content->set_trim_start(film, ContentTime::from_seconds(1.5));
+	content->set_trim_start(ContentTime::from_seconds(1.5));
 	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate(48);
 	player->setup_pieces();
@@ -530,7 +530,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test2)
 	   be used to make 3 * 24 frames of DCP video.
 	*/
 	content->set_position(film, DCPTime());
-	content->set_trim_start(film, ContentTime());
+	content->set_trim_start(ContentTime());
 	content->set_video_frame_rate(film, 48);
 	film->set_video_frame_rate(24);
 	player->setup_pieces();
@@ -542,7 +542,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test2)
 
 	/* Position 3s, no trim, content rate 24, DCP rate 48 */
 	content->set_position(film, DCPTime::from_seconds(3));
-	content->set_trim_start(film, ContentTime());
+	content->set_trim_start(ContentTime());
 	content->set_video_frame_rate(film, 48);
 	film->set_video_frame_rate(24);
 	player->setup_pieces();
@@ -554,7 +554,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test2)
 
 	/* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
 	content->set_position(film, DCPTime::from_seconds(3));
-	content->set_trim_start(film, ContentTime::from_seconds(1.5));
+	content->set_trim_start(ContentTime::from_seconds(1.5));
 	content->set_video_frame_rate(film, 48);
 	film->set_video_frame_rate(24);
 	player->setup_pieces();
@@ -584,7 +584,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test3)
 
 	/* Position 0, no trim, video/audio content rate = video/audio DCP rate */
 	content->set_position(film, DCPTime());
-	content->set_trim_start(film, ContentTime());
+	content->set_trim_start(ContentTime());
 	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate(24);
 	stream->_frame_rate = 48000;
@@ -597,7 +597,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test3)
 
 	/* Position 3s, no trim, video/audio content rate = video/audio DCP rate */
 	content->set_position(film, DCPTime::from_seconds(3));
-	content->set_trim_start(film, ContentTime());
+	content->set_trim_start(ContentTime());
 	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate(24);
 	stream->_frame_rate = 48000;
@@ -612,7 +612,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test3)
 
 	/* Position 3s, 1.5s trim, video/audio content rate = video/audio DCP rate */
 	content->set_position(film, DCPTime::from_seconds(3));
-	content->set_trim_start(film, ContentTime::from_seconds(1.5));
+	content->set_trim_start(ContentTime::from_seconds(1.5));
 	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate(24);
 	stream->_frame_rate = 48000;
@@ -627,7 +627,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test3)
 
 	/* Position 0, no trim, content video rate 24, DCP video rate 25, both audio rates still 48k */
 	content->set_position(film, DCPTime());
-	content->set_trim_start(film, ContentTime());
+	content->set_trim_start(ContentTime());
 	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate(25);
 	stream->_frame_rate = 48000;
@@ -640,7 +640,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test3)
 
 	/* Position 3s, no trim, content video rate 24, DCP rate 25, both audio rates still 48k. */
 	content->set_position(film, DCPTime::from_seconds(3));
-	content->set_trim_start(film, ContentTime());
+	content->set_trim_start(ContentTime());
 	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate(25);
 	stream->_frame_rate = 48000;
@@ -657,7 +657,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test3)
 	   1s of content is 46080 samples after resampling.
 	*/
 	content->set_position(film, DCPTime::from_seconds(3));
-	content->set_trim_start(film, ContentTime::from_seconds(1.6));
+	content->set_trim_start(ContentTime::from_seconds(1.6));
 	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate(25);
 	stream->_frame_rate = 48000;
@@ -676,7 +676,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test3)
 	   The results should be the same as the content rate = DCP rate case.
 	*/
 	content->set_position(film, DCPTime());
-	content->set_trim_start(film, ContentTime());
+	content->set_trim_start(ContentTime());
 	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate(48);
 	stream->_frame_rate = 48000;
@@ -689,7 +689,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test3)
 
 	/* Position 3s, no trim, content rate 24, DCP rate 48 */
 	content->set_position(film, DCPTime::from_seconds(3));
-	content->set_trim_start(film, ContentTime());
+	content->set_trim_start(ContentTime());
 	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate(24);
 	stream->_frame_rate = 48000;
@@ -704,7 +704,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test3)
 
 	/* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
 	content->set_position(film, DCPTime::from_seconds(3));
-	content->set_trim_start(film, ContentTime::from_seconds(1.5));
+	content->set_trim_start(ContentTime::from_seconds(1.5));
 	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate(24);
 	stream->_frame_rate = 48000;
@@ -722,7 +722,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test3)
 	   with skipped frames in this case, audio samples should map straight through.
 	*/
 	content->set_position(film, DCPTime());
-	content->set_trim_start(film, ContentTime());
+	content->set_trim_start(ContentTime());
 	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate(48);
 	stream->_frame_rate = 48000;
@@ -735,7 +735,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test3)
 
 	/* Position 3s, no trim, content rate 24, DCP rate 48 */
 	content->set_position(film, DCPTime::from_seconds(3));
-	content->set_trim_start(film, ContentTime());
+	content->set_trim_start(ContentTime());
 	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate(24);
 	stream->_frame_rate = 48000;
@@ -750,7 +750,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test3)
 
 	/* Position 3s, 1.5s trim, content rate 24, DCP rate 48 */
 	content->set_position(film, DCPTime::from_seconds(3));
-	content->set_trim_start(film, ContentTime::from_seconds(1.5));
+	content->set_trim_start(ContentTime::from_seconds(1.5));
 	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate(24);
 	stream->_frame_rate = 48000;
@@ -765,7 +765,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test3)
 
 	/* Position 0, no trim, video content rate = video DCP rate, content audio rate = 44.1k */
 	content->set_position(film, DCPTime());
-	content->set_trim_start(film, ContentTime());
+	content->set_trim_start(ContentTime());
 	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate(24);
 	stream->_frame_rate = 44100;
@@ -778,7 +778,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test3)
 
 	/* Position 3s, no trim, video content rate = video DCP rate, content audio rate = 44.1k */
 	content->set_position(film, DCPTime::from_seconds(3));
-	content->set_trim_start(film, ContentTime());
+	content->set_trim_start(ContentTime());
 	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate(24);
 	stream->_frame_rate = 44100;
@@ -793,7 +793,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test3)
 
 	/* Position 3s, 1.5s trim, video content rate = video DCP rate, content audio rate = 44.1k */
 	content->set_position(film, DCPTime::from_seconds(3));
-	content->set_trim_start(film, ContentTime::from_seconds(1.5));
+	content->set_trim_start(ContentTime::from_seconds(1.5));
 	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate(24);
 	stream->_frame_rate = 44100;
@@ -808,7 +808,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test3)
 
 	/* Check with a large start trim */
 	content->set_position(film, DCPTime::from_seconds(0));
-	content->set_trim_start(film, ContentTime::from_seconds(54143));
+	content->set_trim_start(ContentTime::from_seconds(54143));
 	content->set_video_frame_rate(film, 24);
 	film->set_video_frame_rate(24);
 	stream->_frame_rate = 48000;
diff --git a/test/torture_test.cc b/test/torture_test.cc
index f03f6d4e5..f527a92ae 100644
--- a/test/torture_test.cc
+++ b/test/torture_test.cc
@@ -65,7 +65,7 @@ BOOST_AUTO_TEST_CASE (torture_test1)
 	film->examine_and_add_content({staircase});
 	BOOST_REQUIRE (!wait_for_jobs());
 	staircase->set_position (film, DCPTime::from_frames(2000, film->audio_frame_rate()));
-	staircase->set_trim_start(film, ContentTime::from_frames(12, 48000));
+	staircase->set_trim_start(ContentTime::from_frames(12, 48000));
 	staircase->set_trim_end (ContentTime::from_frames (35, 48000));
 	staircase->audio->set_gain (20 * log10(2));
 
@@ -74,7 +74,7 @@ BOOST_AUTO_TEST_CASE (torture_test1)
 	film->examine_and_add_content({staircase});
 	BOOST_REQUIRE (!wait_for_jobs());
 	staircase->set_position (film, DCPTime::from_frames(50000, film->audio_frame_rate()));
-	staircase->set_trim_start(film, ContentTime::from_frames(12, 48000));
+	staircase->set_trim_start(ContentTime::from_frames(12, 48000));
 	staircase->set_trim_end (ContentTime::from_frames(35, 48000));
 	staircase->audio->set_gain (20 * log10(2));
 
diff --git a/test/vf_test.cc b/test/vf_test.cc
index 9c7ff65be..1a2e8170f 100644
--- a/test/vf_test.cc
+++ b/test/vf_test.cc
@@ -175,7 +175,7 @@ BOOST_AUTO_TEST_CASE(vf_test3)
 	auto dcp = make_shared<DCPContent>(ov->dir(ov->dcp_name()));
 	auto vf = new_test_film("vf_test3_vf", { dcp });
 	vf->set_reel_type(ReelType::BY_VIDEO_CONTENT);
-	dcp->set_trim_start(vf, ContentTime::from_seconds(1));
+	dcp->set_trim_start(ContentTime::from_seconds(1));
 	dcp->set_trim_end(ContentTime::from_seconds(1));
 	dcp->set_reference_video(true);
 	dcp->set_reference_audio(true);
@@ -363,7 +363,7 @@ BOOST_AUTO_TEST_CASE(test_vf_with_trimmed_multi_reel_dcp)
 	vf->set_reel_type(ReelType::BY_VIDEO_CONTENT);
 	vf_dcp->set_reference_video(true);
 	vf_dcp->set_reference_audio(true);
-	vf_dcp->set_trim_start(vf, ContentTime::from_seconds(10));
+	vf_dcp->set_trim_start(ContentTime::from_seconds(10));
 	vf_dcp->set_position(vf, DCPTime::from_seconds(10));
 	make_and_verify_dcp(vf, { dcp::VerificationNote::Code::EXTERNAL_ASSET }, false);
 }
diff --git a/test/video_content_test.cc b/test/video_content_test.cc
index ab5f38b77..37e3c3931 100644
--- a/test/video_content_test.cc
+++ b/test/video_content_test.cc
@@ -32,7 +32,7 @@ BOOST_AUTO_TEST_CASE(video_content_fade_test)
 	auto film = new_test_film("video_content_fade_test", { content });
 
 	content->video->set_length(240);
-	content->set_trim_start(film, dcpomatic::ContentTime::from_frames(24, 24));
+	content->set_trim_start(dcpomatic::ContentTime::from_frames(24, 24));
 	content->video->set_fade_in(15);
 	content->video->set_fade_out(4);
 
diff --git a/test/video_trim_test.cc b/test/video_trim_test.cc
index 8ec96dde5..1aa41e243 100644
--- a/test/video_trim_test.cc
+++ b/test/video_trim_test.cc
@@ -38,7 +38,7 @@ BOOST_AUTO_TEST_CASE(video_trim_test)
 	auto content = content_factory("test/data/count300bd24.m2ts")[0];
 	auto film = new_test_film("trim_video_test", { content });
 
-	content->set_trim_start(film, dcpomatic::ContentTime::from_frames(8, 24));
+	content->set_trim_start(dcpomatic::ContentTime::from_frames(8, 24));
 
 	shared_ptr<PlayerVideo> first_video;