Remove another unnecessary Film parameter.

1 files changed, 43 insertions, 43 deletions

diff --git a/test/time_calculation_test.cc b/test/time_calculation_test.cc
index 839e32c8b..00d2bb283 100644
--- a/test/time_calculation_test.cc
+++ b/test/time_calculation_test.cc
@@ -162,11 +162,11 @@ BOOST_AUTO_TEST_CASE(ffmpeg_time_calculation_test)
 
 	/* 24fps content, 24fps DCP */
 	film->set_video_frame_rate(24);
-	content->set_video_frame_rate(film, 24);
+	content->set_video_frame_rate(24);
 	BOOST_CHECK_EQUAL(content->full_length(film).get(), DCPTime::from_seconds(1).get());
 	/* 25fps content, 25fps DCP */
 	film->set_video_frame_rate(25);
-	content->set_video_frame_rate(film, 25);
+	content->set_video_frame_rate(25);
 	BOOST_CHECK_EQUAL(content->full_length(film).get(), DCPTime::from_seconds(1).get());
 	/* 25fps content, 24fps DCP; length should be increased */
 	film->set_video_frame_rate(24);
@@ -202,7 +202,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(ContentTime());
-	content->set_video_frame_rate(film, 24);
+	content->set_video_frame_rate(24);
 	film->set_video_frame_rate(24);
 	player->setup_pieces();
 	BOOST_REQUIRE_EQUAL(player->_pieces.size(), 1U);
@@ -214,7 +214,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(ContentTime());
-	content->set_video_frame_rate(film, 24);
+	content->set_video_frame_rate(24);
 	film->set_video_frame_rate(24);
 	player->setup_pieces();
 	BOOST_REQUIRE_EQUAL(player->_pieces.size(), 1U);
@@ -228,7 +228,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(ContentTime::from_seconds(1.5));
-	content->set_video_frame_rate(film, 24);
+	content->set_video_frame_rate(24);
 	film->set_video_frame_rate(24);
 	player->setup_pieces();
 	BOOST_REQUIRE_EQUAL(player->_pieces.size(), 1U);
@@ -245,7 +245,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test1)
 	*/
 	content->set_position(film, DCPTime());
 	content->set_trim_start(ContentTime());
-	content->set_video_frame_rate(film, 24);
+	content->set_video_frame_rate(24);
 	film->set_video_frame_rate(25);
 	player->setup_pieces();
 	BOOST_REQUIRE_EQUAL(player->_pieces.size(), 1U);
@@ -257,7 +257,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(ContentTime());
-	content->set_video_frame_rate(film, 24);
+	content->set_video_frame_rate(24);
 	film->set_video_frame_rate(25);
 	player->setup_pieces();
 	BOOST_REQUIRE_EQUAL(player->_pieces.size(), 1U);
@@ -274,7 +274,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test1)
 	 */
 	content->set_position(film, DCPTime::from_seconds(3));
 	content->set_trim_start(ContentTime::from_seconds(1.6));
-	content->set_video_frame_rate(film, 24);
+	content->set_video_frame_rate(24);
 	film->set_video_frame_rate(25);
 	player->setup_pieces();
 	BOOST_REQUIRE_EQUAL(player->_pieces.size(), 1U);
@@ -293,7 +293,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test1)
 	*/
 	content->set_position(film, DCPTime());
 	content->set_trim_start(ContentTime());
-	content->set_video_frame_rate(film, 24);
+	content->set_video_frame_rate(24);
 	film->set_video_frame_rate(48);
 	player->setup_pieces();
 	BOOST_REQUIRE_EQUAL(player->_pieces.size(), 1U);
@@ -305,7 +305,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(ContentTime());
-	content->set_video_frame_rate(film, 24);
+	content->set_video_frame_rate(24);
 	film->set_video_frame_rate(48);
 	player->setup_pieces();
 	BOOST_REQUIRE_EQUAL(player->_pieces.size(), 1U);
@@ -319,7 +319,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(ContentTime::from_seconds(1.5));
-	content->set_video_frame_rate(film, 24);
+	content->set_video_frame_rate(24);
 	film->set_video_frame_rate(48);
 	player->setup_pieces();
 	BOOST_REQUIRE_EQUAL(player->_pieces.size(), 1U);
@@ -337,7 +337,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test1)
 	*/
 	content->set_position(film, DCPTime());
 	content->set_trim_start(ContentTime());
-	content->set_video_frame_rate(film, 48);
+	content->set_video_frame_rate(48);
 	film->set_video_frame_rate(24);
 	player->setup_pieces();
 	BOOST_REQUIRE_EQUAL(player->_pieces.size(), 1U);
@@ -349,7 +349,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(ContentTime());
-	content->set_video_frame_rate(film, 48);
+	content->set_video_frame_rate(48);
 	film->set_video_frame_rate(24);
 	player->setup_pieces();
 	BOOST_REQUIRE_EQUAL(player->_pieces.size(), 1U);
@@ -363,7 +363,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(ContentTime::from_seconds(1.5));
-	content->set_video_frame_rate(film, 48);
+	content->set_video_frame_rate(48);
 	film->set_video_frame_rate(24);
 	player->setup_pieces();
 	BOOST_REQUIRE_EQUAL(player->_pieces.size(), 1U);
@@ -377,7 +377,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(ContentTime::from_seconds(0));
-	content->set_video_frame_rate(film, 29.9978733);
+	content->set_video_frame_rate(29.9978733);
 	film->set_video_frame_rate(30);
 	player->setup_pieces();
 	BOOST_REQUIRE_EQUAL(player->_pieces.size(), 1U);
@@ -408,7 +408,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(ContentTime());
-	content->set_video_frame_rate(film, 24);
+	content->set_video_frame_rate(24);
 	film->set_video_frame_rate(24);
 	player->setup_pieces();
 	BOOST_REQUIRE_EQUAL(player->_pieces.size(), 1U);
@@ -420,7 +420,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(ContentTime());
-	content->set_video_frame_rate(film, 24);
+	content->set_video_frame_rate(24);
 	film->set_video_frame_rate(24);
 	player->setup_pieces();
 	BOOST_REQUIRE_EQUAL(player->_pieces.size(), 1U);
@@ -432,7 +432,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(ContentTime::from_seconds(1.5));
-	content->set_video_frame_rate(film, 24);
+	content->set_video_frame_rate(24);
 	film->set_video_frame_rate(24);
 	player->setup_pieces();
 	BOOST_REQUIRE_EQUAL(player->_pieces.size(), 1U);
@@ -448,7 +448,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test2)
 	*/
 	content->set_position(film, DCPTime());
 	content->set_trim_start(ContentTime());
-	content->set_video_frame_rate(film, 24);
+	content->set_video_frame_rate(24);
 	film->set_video_frame_rate(25);
 	player->setup_pieces();
 	BOOST_REQUIRE_EQUAL(player->_pieces.size(), 1U);
@@ -460,7 +460,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(ContentTime());
-	content->set_video_frame_rate(film, 24);
+	content->set_video_frame_rate(24);
 	film->set_video_frame_rate(25);
 	player->setup_pieces();
 	BOOST_REQUIRE_EQUAL(player->_pieces.size(), 1U);
@@ -472,7 +472,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(ContentTime::from_seconds(1.6));
-	content->set_video_frame_rate(film, 24);
+	content->set_video_frame_rate(24);
 	film->set_video_frame_rate(25);
 	player->setup_pieces();
 	BOOST_REQUIRE_EQUAL(player->_pieces.size(), 1U);
@@ -490,7 +490,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test2)
 	*/
 	content->set_position(film, DCPTime());
 	content->set_trim_start(ContentTime());
-	content->set_video_frame_rate(film, 24);
+	content->set_video_frame_rate(24);
 	film->set_video_frame_rate(48);
 	player->setup_pieces();
 	BOOST_REQUIRE_EQUAL(player->_pieces.size(), 1U);
@@ -502,7 +502,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(ContentTime());
-	content->set_video_frame_rate(film, 24);
+	content->set_video_frame_rate(24);
 	film->set_video_frame_rate(48);
 	player->setup_pieces();
 	BOOST_REQUIRE_EQUAL(player->_pieces.size(), 1U);
@@ -514,7 +514,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(ContentTime::from_seconds(1.5));
-	content->set_video_frame_rate(film, 24);
+	content->set_video_frame_rate(24);
 	film->set_video_frame_rate(48);
 	player->setup_pieces();
 	BOOST_REQUIRE_EQUAL(player->_pieces.size(), 1U);
@@ -531,7 +531,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test2)
 	*/
 	content->set_position(film, DCPTime());
 	content->set_trim_start(ContentTime());
-	content->set_video_frame_rate(film, 48);
+	content->set_video_frame_rate(48);
 	film->set_video_frame_rate(24);
 	player->setup_pieces();
 	BOOST_REQUIRE_EQUAL(player->_pieces.size(), 1U);
@@ -543,7 +543,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(ContentTime());
-	content->set_video_frame_rate(film, 48);
+	content->set_video_frame_rate(48);
 	film->set_video_frame_rate(24);
 	player->setup_pieces();
 	BOOST_REQUIRE_EQUAL(player->_pieces.size(), 1U);
@@ -555,7 +555,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(ContentTime::from_seconds(1.5));
-	content->set_video_frame_rate(film, 48);
+	content->set_video_frame_rate(48);
 	film->set_video_frame_rate(24);
 	player->setup_pieces();
 	BOOST_REQUIRE_EQUAL(player->_pieces.size(), 1U);
@@ -585,7 +585,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(ContentTime());
-	content->set_video_frame_rate(film, 24);
+	content->set_video_frame_rate(24);
 	film->set_video_frame_rate(24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces();
@@ -598,7 +598,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(ContentTime());
-	content->set_video_frame_rate(film, 24);
+	content->set_video_frame_rate(24);
 	film->set_video_frame_rate(24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces();
@@ -613,7 +613,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(ContentTime::from_seconds(1.5));
-	content->set_video_frame_rate(film, 24);
+	content->set_video_frame_rate(24);
 	film->set_video_frame_rate(24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces();
@@ -628,7 +628,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(ContentTime());
-	content->set_video_frame_rate(film, 24);
+	content->set_video_frame_rate(24);
 	film->set_video_frame_rate(25);
 	stream->_frame_rate = 48000;
 	player->setup_pieces();
@@ -641,7 +641,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(ContentTime());
-	content->set_video_frame_rate(film, 24);
+	content->set_video_frame_rate(24);
 	film->set_video_frame_rate(25);
 	stream->_frame_rate = 48000;
 	player->setup_pieces();
@@ -658,7 +658,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test3)
 	*/
 	content->set_position(film, DCPTime::from_seconds(3));
 	content->set_trim_start(ContentTime::from_seconds(1.6));
-	content->set_video_frame_rate(film, 24);
+	content->set_video_frame_rate(24);
 	film->set_video_frame_rate(25);
 	stream->_frame_rate = 48000;
 	player->setup_pieces();
@@ -677,7 +677,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test3)
 	*/
 	content->set_position(film, DCPTime());
 	content->set_trim_start(ContentTime());
-	content->set_video_frame_rate(film, 24);
+	content->set_video_frame_rate(24);
 	film->set_video_frame_rate(48);
 	stream->_frame_rate = 48000;
 	player->setup_pieces();
@@ -690,7 +690,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(ContentTime());
-	content->set_video_frame_rate(film, 24);
+	content->set_video_frame_rate(24);
 	film->set_video_frame_rate(24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces();
@@ -705,7 +705,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(ContentTime::from_seconds(1.5));
-	content->set_video_frame_rate(film, 24);
+	content->set_video_frame_rate(24);
 	film->set_video_frame_rate(24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces();
@@ -723,7 +723,7 @@ BOOST_AUTO_TEST_CASE(player_time_calculation_test3)
 	*/
 	content->set_position(film, DCPTime());
 	content->set_trim_start(ContentTime());
-	content->set_video_frame_rate(film, 24);
+	content->set_video_frame_rate(24);
 	film->set_video_frame_rate(48);
 	stream->_frame_rate = 48000;
 	player->setup_pieces();
@@ -736,7 +736,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(ContentTime());
-	content->set_video_frame_rate(film, 24);
+	content->set_video_frame_rate(24);
 	film->set_video_frame_rate(24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces();
@@ -751,7 +751,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(ContentTime::from_seconds(1.5));
-	content->set_video_frame_rate(film, 24);
+	content->set_video_frame_rate(24);
 	film->set_video_frame_rate(24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces();
@@ -766,7 +766,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(ContentTime());
-	content->set_video_frame_rate(film, 24);
+	content->set_video_frame_rate(24);
 	film->set_video_frame_rate(24);
 	stream->_frame_rate = 44100;
 	player->setup_pieces();
@@ -779,7 +779,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(ContentTime());
-	content->set_video_frame_rate(film, 24);
+	content->set_video_frame_rate(24);
 	film->set_video_frame_rate(24);
 	stream->_frame_rate = 44100;
 	player->setup_pieces();
@@ -794,7 +794,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(ContentTime::from_seconds(1.5));
-	content->set_video_frame_rate(film, 24);
+	content->set_video_frame_rate(24);
 	film->set_video_frame_rate(24);
 	stream->_frame_rate = 44100;
 	player->setup_pieces();
@@ -809,7 +809,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(ContentTime::from_seconds(54143));
-	content->set_video_frame_rate(film, 24);
+	content->set_video_frame_rate(24);
 	film->set_video_frame_rate(24);
 	stream->_frame_rate = 48000;
 	player->setup_pieces();