diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-08-06 23:57:22 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-09-03 17:02:24 +0200 |
| commit | f3ab77e34a41ad4d8f5156e9d6598314975b9565 (patch) | |
| tree | 638c81f1b1e71ee138afd4d58ef404e7b3c7f523 /src/lib/dcp_subtitle_content.cc | |
| parent | e65d17fa04c411295496968f6ecee9b3a6c21fae (diff) | |
Adapt to some libdcp class renaming to allow open captions/closed subtitles.
Diffstat (limited to 'src/lib/dcp_subtitle_content.cc')
| -rw-r--r-- | src/lib/dcp_subtitle_content.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc index 58007ac34..cbd8638f3 100644 --- a/src/lib/dcp_subtitle_content.cc +++ b/src/lib/dcp_subtitle_content.cc @@ -25,9 +25,9 @@ #include "font_id_allocator.h" #include "text_content.h" #include <dcp/interop_load_font_node.h> -#include <dcp/interop_subtitle_asset.h> +#include <dcp/interop_text_asset.h> #include <dcp/raw_convert.h> -#include <dcp/smpte_subtitle_asset.h> +#include <dcp/smpte_text_asset.h> #include <libxml++/libxml++.h> #include "i18n.h" @@ -64,8 +64,8 @@ DCPSubtitleContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job) auto subtitle_asset = load(path(0)); - auto iop = dynamic_pointer_cast<dcp::InteropSubtitleAsset>(subtitle_asset); - auto smpte = dynamic_pointer_cast<dcp::SMPTESubtitleAsset>(subtitle_asset); + auto iop = dynamic_pointer_cast<dcp::InteropTextAsset>(subtitle_asset); + auto smpte = dynamic_pointer_cast<dcp::SMPTETextAsset>(subtitle_asset); if (smpte) { set_video_frame_rate(film, smpte->edit_rate().numerator); } @@ -75,7 +75,7 @@ DCPSubtitleContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job) /* Default to turning these subtitles on */ only_text()->set_use (true); - _length = ContentTime::from_seconds(subtitle_asset->latest_subtitle_out().as_seconds()); + _length = ContentTime::from_seconds(subtitle_asset->latest_text_out().as_seconds()); subtitle_asset->fix_empty_font_ids(); add_fonts(only_text(), subtitle_asset); @@ -83,7 +83,7 @@ DCPSubtitleContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job) void -DCPSubtitleContent::add_fonts(shared_ptr<TextContent> content, shared_ptr<dcp::SubtitleAsset> subtitle_asset) +DCPSubtitleContent::add_fonts(shared_ptr<TextContent> content, shared_ptr<dcp::TextAsset> subtitle_asset) { FontIDAllocator font_id_allocator; |