Account for split branch in libdcp.

[dcpomatic.git] / test / subtitle_reel_test.cc

diff --git a/test/subtitle_reel_test.cc b/test/subtitle_reel_test.cc
index d7eb90d251eb45382eff78d2c4a78a2a1213a852..0f9abe78297291dfeda352d1916e3d6f1f78ba03 100644 (file)
--- a/test/subtitle_reel_test.cc
+++ b/test/subtitle_reel_test.cc
@@ -28,7 +28,7 @@
 #include <dcp/dcp.h>
 #include <dcp/cpl.h>
 #include <dcp/reel.h>
-#include <dcp/interop_subtitle_asset.h>
+#include <dcp/interop_text_asset.h>
 #include <dcp/reel_closed_caption_asset.h>
 #include <dcp/reel_subtitle_asset.h>
 #include <boost/test/unit_test.hpp>
@@ -78,25 +78,25 @@ BOOST_AUTO_TEST_CASE (subtitle_reel_test)
        auto i = reels.begin ();
        BOOST_REQUIRE ((*i)->main_subtitle());
        BOOST_REQUIRE ((*i)->main_subtitle()->asset());
-       auto A = std::dynamic_pointer_cast<dcp::InteropSubtitleAsset>((*i)->main_subtitle()->asset());
+       auto A = std::dynamic_pointer_cast<dcp::InteropTextAsset>((*i)->main_subtitle()->asset());
        BOOST_REQUIRE (A);
        ++i;
        BOOST_REQUIRE ((*i)->main_subtitle());
        BOOST_REQUIRE ((*i)->main_subtitle()->asset());
-       auto B = std::dynamic_pointer_cast<dcp::InteropSubtitleAsset>((*i)->main_subtitle()->asset());
+       auto B = std::dynamic_pointer_cast<dcp::InteropTextAsset>((*i)->main_subtitle()->asset());
        BOOST_REQUIRE (B);
 
-       BOOST_REQUIRE_EQUAL (A->subtitles().size(), 1U);
-       BOOST_REQUIRE_EQUAL (B->subtitles().size(), 1U);
+       BOOST_REQUIRE_EQUAL(A->texts().size(), 1U);
+       BOOST_REQUIRE_EQUAL(B->texts().size(), 1U);
 
        /* These times should be the same as they are should be offset from the start of the reel */
-       BOOST_CHECK (A->subtitles().front()->in() == B->subtitles().front()->in());
+       BOOST_CHECK(A->texts().front()->in() == B->texts().front()->in());
 }
 
 
 
 /** Check that with a SMPTE DCP if we have subtitles in one reel, all reels have a
- *  SubtitleAsset (even if it's empty); SMPTE Bv2.1 section 8.3.1.
+ *  TextAsset (even if it's empty); SMPTE Bv2.1 section 8.3.1.
  */
 BOOST_AUTO_TEST_CASE (subtitle_in_all_reels_test)
 {
@@ -224,7 +224,7 @@ BOOST_AUTO_TEST_CASE (subtitles_split_at_reel_boundaries)
                BOOST_REQUIRE (reel_sub);
                auto sub = reel_sub->asset();
                BOOST_REQUIRE (sub);
-               BOOST_CHECK_EQUAL (sub->subtitles().size(), 1U);
+               BOOST_CHECK_EQUAL(sub->texts().size(), 1U);
        }
 }