Account for split branch in libdcp.
[dcpomatic.git] / test / dcp_subtitle_test.cc
index 9b7b77279968f6afffa977c448a685ebb7989ed4..fc7aee984f51873101f35ae98241ef5155c3d0d9 100644 (file)
@@ -39,7 +39,7 @@
 #include "test.h"
 #include <dcp/mono_picture_asset.h>
 #include <dcp/openjpeg_image.h>
-#include <dcp/smpte_subtitle_asset.h>
+#include <dcp/smpte_text_asset.h>
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 
@@ -292,12 +292,12 @@ BOOST_AUTO_TEST_CASE(entity_from_dcp_source)
                        dcp::VerificationNote::Code::INVALID_SUBTITLE_SPACING,
                });
 
-       dcp::SMPTESubtitleAsset check(dcp_file(film, "sub_"));
-       auto subs = check.subtitles();
+       dcp::SMPTETextAsset check(dcp_file(film, "sub_"));
+       auto subs = check.texts();
        BOOST_REQUIRE_EQUAL(subs.size(), 1U);
-       auto sub = std::dynamic_pointer_cast<const dcp::SubtitleString>(subs[0]);
+       auto sub = std::dynamic_pointer_cast<const dcp::TextString>(subs[0]);
        BOOST_REQUIRE(sub);
-       /* libdcp::SubtitleAsset gets the text from the XML with get_content(), which
+       /* dcp::TextAsset gets the text from the XML with get_content(), which
         * resolves the 5 predefined entities & " < > ' so we shouldn't see any
         * entity here.
         */