Noisy change to get film into AudioContent::modify_trim_start().

[dcpomatic.git] / test / file_naming_test.cc

diff --git a/test/file_naming_test.cc b/test/file_naming_test.cc
index 4f6d66fe6da7743f104e0d9f0731bae435c55ac2..be4856cd1bce236d5c4b2aab3dc6da1c4fc592bc 100644 (file)
--- a/test/file_naming_test.cc
+++ b/test/file_naming_test.cc
@@ -80,13 +80,13 @@ BOOST_AUTO_TEST_CASE (file_naming_test)
        BOOST_REQUIRE (!wait_for_jobs());
 
        r->set_position (film, dcpomatic::DCPTime::from_seconds(0));
-       r->set_video_frame_rate (24);
+       r->set_video_frame_rate(film, 24);
        r->video->set_length (24);
        g->set_position (film, dcpomatic::DCPTime::from_seconds(1));
-       g->set_video_frame_rate (24);
+       g->set_video_frame_rate(film, 24);
        g->video->set_length (24);
        b->set_position (film, dcpomatic::DCPTime::from_seconds(2));
-       b->set_video_frame_rate (24);
+       b->set_video_frame_rate(film, 24);
        b->video->set_length (24);
 
        film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
@@ -139,13 +139,13 @@ BOOST_AUTO_TEST_CASE (file_naming_test2)
        BOOST_REQUIRE (!wait_for_jobs());
 
        r->set_position (film, dcpomatic::DCPTime::from_seconds(0));
-       r->set_video_frame_rate (24);
+       r->set_video_frame_rate(film, 24);
        r->video->set_length (24);
        g->set_position (film, dcpomatic::DCPTime::from_seconds(1));
-       g->set_video_frame_rate (24);
+       g->set_video_frame_rate(film, 24);
        g->video->set_length (24);
        b->set_position (film, dcpomatic::DCPTime::from_seconds(2));
-       b->set_video_frame_rate (24);
+       b->set_video_frame_rate(film, 24);
        b->video->set_length (24);
 
        film->set_reel_type (ReelType::BY_VIDEO_CONTENT);
@@ -180,7 +180,7 @@ BOOST_AUTO_TEST_CASE (subtitle_file_naming)
        Config::instance()->set_dcp_asset_filename_format(dcp::NameFormat("%t ostrabagalous %c"));
 
        auto content = content_factory("test/data/15s.srt");
-       auto film = new_test_film2("subtitle_file_naming", { content.front() });
+       auto film = new_test_film2("subtitle_file_naming", content);
        film->set_interop(false);
 
        make_and_verify_dcp (