diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-06-28 20:12:51 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-08-17 12:57:31 +0200 |
| commit | 06c28c700f0a398a3289c4adfa83ceb2d0fc999d (patch) | |
| tree | 00b58dcb854767d037e166a804360b4c19e034e9 /test/test.cc | |
| parent | b64644327bff333569bf4a60f1d7c3d46f058b48 (diff) | |
Merge ReelClosedCaptionAsset into ReelTextAsset.
Diffstat (limited to 'test/test.cc')
| -rw-r--r-- | test/test.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/test/test.cc b/test/test.cc index ef5424b6..8e30878d 100644 --- a/test/test.cc +++ b/test/test.cc @@ -46,12 +46,10 @@ #include "j2k_picture_asset_writer.h" #include "reel.h" #include "reel_asset.h" -#include "reel_interop_closed_caption_asset.h" #include "reel_interop_text_asset.h" #include "reel_markers_asset.h" #include "reel_mono_picture_asset.h" #include "reel_mono_picture_asset.h" -#include "reel_smpte_closed_caption_asset.h" #include "reel_smpte_text_asset.h" #include "reel_sound_asset.h" #include "smpte_subtitle_asset.h" @@ -447,7 +445,7 @@ make_simple_with_interop_subs (boost::filesystem::path path) subs->add_font ("afont", data); subs->write (path / "subs" / "subs.xml"); - auto reel_subs = make_shared<dcp::ReelInteropTextAsset>(subs, dcp::Fraction(24, 1), 240, 0); + auto reel_subs = make_shared<dcp::ReelInteropTextAsset>(dcp::TextType::SUBTITLE, subs, dcp::Fraction(24, 1), 240, 0); dcp->cpls().front()->reels().front()->add (reel_subs); return dcp; @@ -468,7 +466,7 @@ make_simple_with_smpte_subs (boost::filesystem::path path) subs->write (path / "subs.mxf"); - auto reel_subs = make_shared<dcp::ReelSMPTETextAsset>(subs, dcp::Fraction(24, 1), 192, 0); + auto reel_subs = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::SUBTITLE, subs, dcp::Fraction(24, 1), 192, 0); dcp->cpls().front()->reels().front()->add (reel_subs); return dcp; @@ -484,7 +482,7 @@ make_simple_with_interop_ccaps (boost::filesystem::path path) subs->add (simple_subtitle()); subs->write (path / "ccap.xml"); - auto reel_caps = make_shared<dcp::ReelInteropClosedCaptionAsset>(subs, dcp::Fraction(24, 1), 240, 0); + auto reel_caps = make_shared<dcp::ReelInteropTextAsset>(dcp::TextType::CAPTION, subs, dcp::Fraction(24, 1), 240, 0); dcp->cpls()[0]->reels()[0]->add (reel_caps); return dcp; @@ -504,7 +502,7 @@ make_simple_with_smpte_ccaps (boost::filesystem::path path) subs->add_font("font", fake_font); subs->write (path / "ccap.mxf"); - auto reel_caps = make_shared<dcp::ReelSMPTEClosedCaptionAsset>(subs, dcp::Fraction(24, 1), 192, 0); + auto reel_caps = make_shared<dcp::ReelSMPTETextAsset>(dcp::TextType::CAPTION, subs, dcp::Fraction(24, 1), 192, 0); dcp->cpls()[0]->reels()[0]->add(reel_caps); return dcp; |