Account for split branch in libdcp.

[dcpomatic.git] / test / render_subtitles_test.cc

diff --git a/test/render_subtitles_test.cc b/test/render_subtitles_test.cc
index e3034def01f209d7bab87914163bbe653d20eed4..dec686a21860fb6ddba35ac21d349e984dd51c15 100644 (file)
--- a/test/render_subtitles_test.cc
+++ b/test/render_subtitles_test.cc
@@ -30,7 +30,7 @@
 #include "lib/render_text.h"
 #include "lib/string_text.h"
 #include "test.h"
-#include <dcp/subtitle_string.h>
+#include <dcp/text_string.h>
 #include <boost/test/unit_test.hpp>
 
 
@@ -43,7 +43,7 @@ add(std::vector<StringText>& s, std::string text, bool italic, bool bold, bool u
 {
        s.push_back (
                StringText (
-                       dcp::SubtitleString (
+                       dcp::TextString(
                                boost::optional<std::string> (),
                                italic,
                                bold,
@@ -69,7 +69,7 @@ add(std::vector<StringText>& s, std::string text, bool italic, bool bold, bool u
                                ),
                        2,
                        std::shared_ptr<dcpomatic::Font>(),
-                       dcp::SubtitleStandard::SMPTE_2014
+                       dcp::TextStandard::SMPTE_2014
                        )
                );
 }
@@ -125,7 +125,7 @@ BOOST_AUTO_TEST_CASE (marked_up_test6)
 
 BOOST_AUTO_TEST_CASE(render_text_with_newline_test)
 {
-       std::list<dcp::SubtitleString> ss = {
+       std::list<dcp::TextString> ss = {
                {
                        {}, true, false, false, dcp::Colour(255, 255, 255), 42, 1.0,
                        dcp::Time(0, 0, 0, 0, 24), dcp::Time(0, 0, 1, 0, 24),
@@ -156,7 +156,7 @@ BOOST_AUTO_TEST_CASE(render_text_with_newline_test)
 
        std::vector<StringText> st;
        for (auto i: ss) {
-               st.push_back({i, 0, make_shared<dcpomatic::Font>("foo"), dcp::SubtitleStandard::SMPTE_2014});
+               st.push_back({i, 0, make_shared<dcpomatic::Font>("foo"), dcp::TextStandard::SMPTE_2014});
        }
 
        auto images = render_text(st, dcp::Size(1998, 1080), {}, 24);
@@ -177,7 +177,7 @@ BOOST_AUTO_TEST_CASE(render_text_with_newline_test)
 
 BOOST_AUTO_TEST_CASE (render_text_test)
 {
-       auto dcp_string = dcp::SubtitleString(
+       auto dcp_string = dcp::TextString(
                {}, false, false, false, dcp::Colour(255, 255, 255), 42, 1.0,
                dcp::Time(0, 0, 0, 0, 24), dcp::Time(0, 0, 1, 0, 24),
                0.5, dcp::HAlign::CENTER,