diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-06-28 23:56:22 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-06-28 23:56:26 +0200 |
| commit | 1c10ba0bbe5d3f476cfb5a65191774b69670616d (patch) | |
| tree | 4c3b22a8a0fd12cd5bdcbc3a892462be0b21ed5d /src/lib/reel_writer.cc | |
| parent | 8b45384a7c9162d30309345ae863b4cab86aeda1 (diff) | |
wip2801-cap
Diffstat (limited to 'src/lib/reel_writer.cc')
| -rw-r--r-- | src/lib/reel_writer.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc index d8aff1162..e3fc3aab4 100644 --- a/src/lib/reel_writer.cc +++ b/src/lib/reel_writer.cc @@ -46,11 +46,11 @@ #include <dcp/raw_convert.h> #include <dcp/reel.h> #include <dcp/reel_atmos_asset.h> -#include <dcp/reel_interop_closed_caption_asset.h> +#include <dcp/reel_interop_caption_asset.h> #include <dcp/reel_interop_subtitle_asset.h> #include <dcp/reel_markers_asset.h> #include <dcp/reel_mono_picture_asset.h> -#include <dcp/reel_smpte_closed_caption_asset.h> +#include <dcp/reel_smpte_caption_asset.h> #include <dcp/reel_smpte_subtitle_asset.h> #include <dcp/reel_sound_asset.h> #include <dcp/reel_stereo_picture_asset.h> @@ -631,7 +631,7 @@ ReelWriter::create_reel_text ( } for (auto const& i: _closed_caption_assets) { - auto a = maybe_add_text<dcp::ReelInteropClosedCaptionAsset, dcp::ReelSMPTEClosedCaptionAsset, dcp::ReelClosedCaptionAsset> ( + auto a = maybe_add_text<dcp::ReelInteropCaptionAsset, dcp::ReelSMPTECaptionAsset, dcp::ReelCaptionAsset> ( i.second, duration, reel, _reel_index, _reel_count, _content_summary, refs, film(), _period, output_dcp, _text_only ); DCPOMATIC_ASSERT (a); @@ -645,7 +645,7 @@ ReelWriter::create_reel_text ( /* Make empty tracks for anything we've been asked to ensure but that we haven't added */ for (auto i: ensure_closed_captions) { - auto a = maybe_add_text<dcp::ReelInteropClosedCaptionAsset, dcp::ReelSMPTEClosedCaptionAsset, dcp::ReelClosedCaptionAsset> ( + auto a = maybe_add_text<dcp::ReelInteropCaptionAsset, dcp::ReelSMPTECaptionAsset, dcp::ReelCaptionAsset> ( empty_text_asset(TextType::CLOSED_CAPTION, i, true), duration, reel, |