summaryrefslogtreecommitdiff
path: root/test/test.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2024-06-28 21:49:44 +0200
committerCarl Hetherington <cth@carlh.net>2024-08-17 12:57:31 +0200
commita5adc9221d0af15f345cd3dbc76f37ee47fe65d5 (patch)
tree0c53851f161fa38d6d7a081ba3de1fa030048ed2 /test/test.cc
parent8e43142645252daeeaccbad7b9f3ed746c4b2382 (diff)
Subtitle{,String,Image} -> Text{,String,Image}.
Diffstat (limited to 'test/test.cc')
-rw-r--r--test/test.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/test/test.cc b/test/test.cc
index e1d5ce77..b4d51e9c 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -391,10 +391,10 @@ make_simple (boost::filesystem::path path, int reels, int frames, dcp::Standard
}
-shared_ptr<dcp::Subtitle>
-simple_subtitle ()
+shared_ptr<dcp::Text>
+simple_text()
{
- return std::make_shared<dcp::SubtitleString>(
+ return std::make_shared<dcp::TextString>(
optional<string>(),
false,
false,
@@ -437,7 +437,7 @@ make_simple_with_interop_subs (boost::filesystem::path path)
auto dcp = make_simple (path, 1, 24, dcp::Standard::INTEROP);
auto subs = make_shared<dcp::InteropTextAsset>();
- subs->add (simple_subtitle());
+ subs->add(simple_text());
boost::filesystem::create_directory (path / "subs");
dcp::ArrayData data(4096);
@@ -460,7 +460,7 @@ make_simple_with_smpte_subs (boost::filesystem::path path)
auto subs = make_shared<dcp::SMPTETextAsset>();
subs->set_language (dcp::LanguageTag("de-DE"));
subs->set_start_time (dcp::Time());
- subs->add (simple_subtitle());
+ subs->add(simple_text());
dcp::ArrayData fake_font(1024);
subs->add_font("font", fake_font);
@@ -479,7 +479,7 @@ make_simple_with_interop_ccaps (boost::filesystem::path path)
auto dcp = make_simple (path, 1, 24, dcp::Standard::INTEROP);
auto subs = make_shared<dcp::InteropTextAsset>();
- subs->add (simple_subtitle());
+ subs->add(simple_text());
subs->write (path / "ccap.xml");
auto reel_caps = make_shared<dcp::ReelInteropTextAsset>(dcp::TextType::CAPTION, subs, dcp::Fraction(24, 1), 240, 0);
@@ -497,7 +497,7 @@ make_simple_with_smpte_ccaps (boost::filesystem::path path)
auto subs = make_shared<dcp::SMPTETextAsset>();
subs->set_language (dcp::LanguageTag("de-DE"));
subs->set_start_time (dcp::Time());
- subs->add (simple_subtitle());
+ subs->add(simple_text());
dcp::ArrayData fake_font(1024);
subs->add_font("font", fake_font);
subs->write (path / "ccap.mxf");