diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-12-04 23:14:40 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-12-05 00:49:33 +0100 |
| commit | e3033879f7693d40f652f013b00c76deed6994da (patch) | |
| tree | 16c6a62810d61306e15b0e81e8f4ef92015d0473 /test/test.cc | |
| parent | 6973568117ed23c300f5ffa538f7eae87a9a9927 (diff) | |
Rename everything.
Diffstat (limited to 'test/test.cc')
| -rw-r--r-- | test/test.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/test.cc b/test/test.cc index d384bdfa..12b1016e 100644 --- a/test/test.cc +++ b/test/test.cc @@ -36,7 +36,7 @@ #include "compose.hpp" #include "cpl.h" #include "dcp.h" -#include "interop_subtitle_asset.h" +#include "interop_text_asset.h" #include "file.h" #include "j2k_transcode.h" #include "mono_picture_asset.h" @@ -54,7 +54,7 @@ #include "reel_smpte_closed_caption_asset.h" #include "reel_smpte_subtitle_asset.h" #include "reel_sound_asset.h" -#include "smpte_subtitle_asset.h" +#include "smpte_text_asset.h" #include "sound_asset.h" #include "sound_asset_writer.h" #include "test.h" @@ -393,10 +393,10 @@ make_simple (boost::filesystem::path path, int reels, int frames, dcp::Standard } -shared_ptr<dcp::Subtitle> +shared_ptr<dcp::Text> simple_subtitle () { - return std::make_shared<dcp::SubtitleString>( + return std::make_shared<dcp::TextString>( optional<string>(), false, false, @@ -438,7 +438,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::InteropSubtitleAsset>(); + auto subs = make_shared<dcp::InteropTextAsset>(); subs->add (simple_subtitle()); boost::filesystem::create_directory (path / "subs"); @@ -459,7 +459,7 @@ make_simple_with_smpte_subs (boost::filesystem::path path) { auto dcp = make_simple (path, 1, 192); - auto subs = make_shared<dcp::SMPTESubtitleAsset>(); + auto subs = make_shared<dcp::SMPTETextAsset>(); subs->set_language (dcp::LanguageTag("de-DE")); subs->set_start_time (dcp::Time()); subs->add (simple_subtitle()); @@ -480,7 +480,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::InteropSubtitleAsset>(); + auto subs = make_shared<dcp::InteropTextAsset>(); subs->add (simple_subtitle()); subs->write (path / "ccap.xml"); @@ -496,7 +496,7 @@ make_simple_with_smpte_ccaps (boost::filesystem::path path) { auto dcp = make_simple (path, 1, 192); - auto subs = make_shared<dcp::SMPTESubtitleAsset>(); + auto subs = make_shared<dcp::SMPTETextAsset>(); subs->set_language (dcp::LanguageTag("de-DE")); subs->set_start_time (dcp::Time()); subs->add (simple_subtitle()); |