Account for split branch in libdcp.

[dcpomatic.git] / test / subtitle_font_id_test.cc

diff --git a/test/subtitle_font_id_test.cc b/test/subtitle_font_id_test.cc
index f6bd48c51d0859260b5e36e42c63fd57f3db9f47..e420338255632979c74ad8842430daa4c676c85e 100644 (file)
--- a/test/subtitle_font_id_test.cc
+++ b/test/subtitle_font_id_test.cc
@@ -29,7 +29,7 @@
 #include <dcp/dcp.h>
 #include <dcp/reel.h>
 #include <dcp/reel_subtitle_asset.h>
-#include <dcp/smpte_subtitle_asset.h>
+#include <dcp/smpte_text_asset.h>
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 
@@ -127,7 +127,7 @@ BOOST_AUTO_TEST_CASE(make_dcp_with_subs_without_font_tag)
                });
 
        auto check_file = subtitle_file(film);
-       dcp::SMPTESubtitleAsset check_asset(check_file);
+       dcp::SMPTETextAsset check_asset(check_file);
        BOOST_CHECK_EQUAL(check_asset.load_font_nodes().size(), 1U);
        auto check_font_data = check_asset.font_data();
        BOOST_CHECK_EQUAL(check_font_data.size(), 1U);
@@ -186,7 +186,7 @@ BOOST_AUTO_TEST_CASE(make_dcp_with_subs_in_dcp_without_font_tag)
                });
 
        auto check_file = subtitle_file(film);
-       dcp::SMPTESubtitleAsset check_asset(check_file);
+       dcp::SMPTETextAsset check_asset(check_file);
        BOOST_CHECK_EQUAL(check_asset.load_font_nodes().size(), 1U);
        auto check_font_data = check_asset.font_data();
        BOOST_CHECK_EQUAL(check_font_data.size(), 1U);
@@ -254,8 +254,8 @@ BOOST_AUTO_TEST_CASE(subtitle_with_no_font_test)
        BOOST_REQUIRE(check_subs);
 
        BOOST_CHECK_EQUAL(check_subs->font_data().size(), 1U);
-       BOOST_REQUIRE_EQUAL(check_subs->subtitles().size(), 1U);
-       BOOST_CHECK(!std::dynamic_pointer_cast<const dcp::SubtitleString>(check_subs->subtitles()[0])->font().has_value());
+       BOOST_REQUIRE_EQUAL(check_subs->texts().size(), 1U);
+       BOOST_CHECK(!std::dynamic_pointer_cast<const dcp::TextString>(check_subs->texts()[0])->font().has_value());
 
        auto check_film = new_test_film2(name_base + "_check", { make_shared<DCPContent>(bad_film->dir(bad_film->dcp_name())) });
        make_and_verify_dcp(check_film);