X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_dcp_test.cc;h=8b441db98578f7573ba6845298c29a869ea4915b;hb=c008066160d85b9ec9e5485375d7baaa5d27bda2;hp=1c897bcd93a90bc158fcbbb9232debe7e72a1529;hpb=cfdd68eb5fb0ef8423e860103ad4e5510994f1da;p=dcpomatic.git

diff --git a/test/ffmpeg_dcp_test.cc b/test/ffmpeg_dcp_test.cc
index 1c897bcd9..8b441db98 100644
--- a/test/ffmpeg_dcp_test.cc
+++ b/test/ffmpeg_dcp_test.cc
@@ -38,11 +38,12 @@ BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test)
 	shared_ptr<Film> film = new_test_film ("ffmpeg_dcp_test");
 	film->set_name ("test_film2");
 	shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4"));
-	c->set_scale (VideoContentScale (Ratio::from_id ("185")));
-	film->examine_and_add_content (c);
+	film->examine_and_add_content (c, true);
 
 	wait_for_jobs ();
 	
+	c->set_scale (VideoContentScale (Ratio::from_id ("185")));
+	
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
 	film->make_dcp ();
@@ -51,16 +52,16 @@ BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test)
 	wait_for_jobs ();
 }
 
-/** Test Film::have_dcp().  Requires the output from ffmpeg_dcp_test above */
+/** Briefly test Film::cpls().  Requires the output from ffmpeg_dcp_test above */
 BOOST_AUTO_TEST_CASE (ffmpeg_have_dcp_test)
 {
 	boost::filesystem::path p = test_film_dir ("ffmpeg_dcp_test");
 	shared_ptr<Film> f (new Film (p.string ()));
 	f->read_metadata ();
-	BOOST_CHECK (!f->dcps().empty());
+	BOOST_CHECK (!f->cpls().empty());
 
 	p /= f->dcp_name();
 	p /= f->video_mxf_filename();
 	boost::filesystem::remove (p);
-	BOOST_CHECK (f->dcps().empty());
+	BOOST_CHECK (f->cpls().empty());
 }