Merge remote-tracking branch 'origin/main' into v2.17.x

[dcpomatic.git] / test / remake_with_subtitle_test.cc

diff --git a/test/remake_with_subtitle_test.cc b/test/remake_with_subtitle_test.cc
index 3b6cf930c8a71bb87fbc8b6dcf84ff281aa80bd8..70d38c1ebcef63dab0cc8d9989112cd2c7b29eba 100644 (file)
--- a/test/remake_with_subtitle_test.cc
+++ b/test/remake_with_subtitle_test.cc
@@ -27,7 +27,6 @@
 #include <boost/test/unit_test.hpp>
 
 
-using std::shared_ptr;
 using std::dynamic_pointer_cast;
 
 
@@ -37,7 +36,7 @@ using std::dynamic_pointer_cast;
 BOOST_AUTO_TEST_CASE (remake_with_subtitle_test)
 {
        auto film = new_test_film2 ("remake_with_subtitle_test");
-       auto content = dynamic_pointer_cast<FFmpegContent>(content_factory(TestPaths::private_data() / "prophet_short_clip.mkv").front());
+       auto content = dynamic_pointer_cast<FFmpegContent>(content_factory(TestPaths::private_data() / "prophet_short_clip.mkv")[0]);
        film->examine_and_add_content (content);
        BOOST_REQUIRE (!wait_for_jobs ());
        content->only_text()->set_burn (true);
@@ -49,5 +48,9 @@ BOOST_AUTO_TEST_CASE (remake_with_subtitle_test)
        content->only_text()->set_use (false);
        make_and_verify_dcp (film);
 
-       check_one_frame (film->dir(film->dcp_name()), 325, TestPaths::private_data() / "prophet_frame_325_no_subs.j2c");
+#ifdef DCPOMATIC_OSX
+       check_one_frame(film->dir(film->dcp_name()), 325, TestPaths::private_data() / "v2.18.x" / "prophet_frame_325_no_subs_mac.j2c");
+#else
+       check_one_frame(film->dir(film->dcp_name()), 325, TestPaths::private_data() / "v2.18.x" / "prophet_frame_325_no_subs.j2c");
+#endif
 }