Don't write multiple <LoadFont> tags to Interop subtitles (#1273).

[dcpomatic.git] / test / recover_test.cc

diff --git a/test/recover_test.cc b/test/recover_test.cc
index 95e45e08bf9c4439ee229638d5b78fb0b6d77d77..4222426c3ce9341d6e92bf58e363bedf3705b68c 100644 (file)
--- a/test/recover_test.cc
+++ b/test/recover_test.cc
@@ -50,6 +50,7 @@ note (dcp::NoteType t, string n)
 BOOST_AUTO_TEST_CASE (recover_test_2d)
 {
        shared_ptr<Film> film = new_test_film ("recover_test_2d");
+       film->set_interop (false);
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
        film->set_container (Ratio::from_id ("185"));
        film->set_name ("recover_test");
@@ -61,7 +62,7 @@ BOOST_AUTO_TEST_CASE (recover_test_2d)
        film->make_dcp ();
        wait_for_jobs ();
 
-       boost::filesystem::path const video = "build/test/recover_test_2d/video/185_2K_517799e697fdd13033f9f7e836e7dc43_24_100000000_P_S_0_1200000.mxf";
+       boost::filesystem::path const video = "build/test/recover_test_2d/video/185_2K_84d36460538435d5d511ee533c8528df_24_100000000_P_S_0_1200000.mxf";
        boost::filesystem::copy_file (
                video,
                "build/test/recover_test_2d/original.mxf"
@@ -82,6 +83,7 @@ BOOST_AUTO_TEST_CASE (recover_test_2d)
 BOOST_AUTO_TEST_CASE (recover_test_3d)
 {
        shared_ptr<Film> film = new_test_film ("recover_test_3d");
+       film->set_interop (false);
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
        film->set_container (Ratio::from_id ("185"));
        film->set_name ("recover_test");
@@ -118,6 +120,7 @@ BOOST_AUTO_TEST_CASE (recover_test_3d)
 BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted)
 {
        shared_ptr<Film> film = new_test_film ("recover_test_2d_encrypted");
+       film->set_interop (false);
        film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
        film->set_container (Ratio::from_id ("185"));
        film->set_name ("recover_test");
@@ -131,7 +134,7 @@ BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted)
        wait_for_jobs ();
 
        boost::filesystem::path const video =
-               "build/test/recover_test_2d_encrypted/video/185_2K_517799e697fdd13033f9f7e836e7dc43_24_100000000_E_S_0_1200000.mxf";
+               "build/test/recover_test_2d_encrypted/video/185_2K_84d36460538435d5d511ee533c8528df_24_100000000_E_S_0_1200000.mxf";
 
        boost::filesystem::copy_file (
                video,