X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fcontent_test.cc;h=55e34ac5f0fb170596494dccb184d865f772078d;hb=f77ec143719c86ddbf098bff6d19fe2a159b8c3e;hp=330bbdc9462a3094d45253816859ab0698651ed6;hpb=d9561404372d187ea7813389ac69545de614f259;p=dcpomatic.git

diff --git a/test/content_test.cc b/test/content_test.cc
index 330bbdc94..55e34ac5f 100644
--- a/test/content_test.cc
+++ b/test/content_test.cc
@@ -41,7 +41,7 @@ BOOST_AUTO_TEST_CASE (content_test1)
 	film->set_name ("content_test1");
 	film->set_container (Ratio::from_id ("185"));
 
-	shared_ptr<Content> content = content_factory(film, private_data / "demo_sound_bug.mkv").front ();
+	shared_ptr<Content> content = content_factory(private_data / "demo_sound_bug.mkv").front ();
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs ());
 	film->make_dcp ();
@@ -69,7 +69,7 @@ BOOST_AUTO_TEST_CASE (content_test2)
 {
 	shared_ptr<Film> film = new_test_film2 ("content_test2");
 
-	shared_ptr<Content> content = content_factory(film, "test/data/red_23976.mp4").front();
+	shared_ptr<Content> content = content_factory("test/data/red_23976.mp4").front();
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs ());
 	content->set_trim_start(ContentTime::from_seconds(0.5));
@@ -83,7 +83,7 @@ BOOST_AUTO_TEST_CASE (content_test3)
 	shared_ptr<Film> film = new_test_film2 ("content_test3");
 	film->set_sequence (false);
 
-	shared_ptr<Content> content = content_factory(film, "test/data/red_24.mp4").front();
+	shared_ptr<Content> content = content_factory("test/data/red_24.mp4").front();
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs ());
 
@@ -104,15 +104,15 @@ BOOST_AUTO_TEST_CASE (content_test3)
 	/* Position */
 
 	/* 12 frames */
-	content->set_position (DCPTime::from_seconds (12.0 / 24.0));
+	content->set_position (film, DCPTime::from_seconds(12.0 / 24.0));
 	BOOST_CHECK (content->position() == DCPTime::from_seconds (12.0 / 24.0));
 
 	/* 11.2 frames */
-	content->set_position (DCPTime::from_seconds (11.2 / 24.0));
+	content->set_position (film, DCPTime::from_seconds(11.2 / 24.0));
 	BOOST_CHECK (content->position() == DCPTime::from_seconds (11.0 / 24.0));
 
 	/* 13.9 frames */
-	content->set_position (DCPTime::from_seconds (13.9 / 24.0));
+	content->set_position (film, DCPTime::from_seconds(13.9 / 24.0));
 	BOOST_CHECK (content->position() == DCPTime::from_seconds (14.0 / 24.0));
 
 	content->set_video_frame_rate (25);
@@ -120,9 +120,4 @@ BOOST_AUTO_TEST_CASE (content_test3)
 	/* Check that trim is fixed when the content's video frame rate is `forced' */
 
 	BOOST_CHECK (content->trim_start() == ContentTime::from_seconds (15.0 / 25.0));
-
-	/* Likewise position */
-
-	std::cout << to_string(content->position()) << " " << to_string(DCPTime::from_seconds(15.0 / 25.0)) << "\n";
-	BOOST_CHECK (content->position() == DCPTime::from_seconds (15.0 / 25.0));
 }