Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0

[dcpomatic.git] / test / black_fill_test.cc

diff --git a/test/black_fill_test.cc b/test/black_fill_test.cc
index 7741277a595e753cacd76ffdff1b5a2f67b3cf0f..5981552d128e6c3f9f0ead28bacfc772ee2fd718 100644 (file)
--- a/test/black_fill_test.cc
+++ b/test/black_fill_test.cc
@@ -33,21 +33,21 @@ using boost::shared_ptr;
 BOOST_AUTO_TEST_CASE (black_fill_test)
 {
        shared_ptr<Film> film = new_test_film ("black_fill_test");
-       film->set_dcp_content_type (DCPContentType::from_dci_name ("FTR"));
+       film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
        film->set_name ("black_fill_test");
        film->set_container (Ratio::from_id ("185"));
        film->set_sequence_video (false);
        shared_ptr<ImageContent> contentA (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
-       contentA->set_scale (VideoContentScale (Ratio::from_id ("185")));
        shared_ptr<ImageContent> contentB (new ImageContent (film, "test/data/simple_testcard_640x480.png"));
-       contentB->set_scale (VideoContentScale (Ratio::from_id ("185")));
 
        film->examine_and_add_content (contentA);
        film->examine_and_add_content (contentB);
        wait_for_jobs ();
 
+       contentA->set_scale (VideoContentScale (Ratio::from_id ("185")));
        contentA->set_video_length (ContentTime::from_frames (3, 24));
        contentA->set_position (DCPTime::from_frames (2, film->video_frame_rate ()));
+       contentB->set_scale (VideoContentScale (Ratio::from_id ("185")));
        contentB->set_video_length (ContentTime::from_frames (1, 24));
        contentB->set_position (DCPTime::from_frames (7, film->video_frame_rate ()));