diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-12-05 01:59:44 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-12-05 01:59:44 +0100 |
| commit | 751379da4be48f9b911a91cf17686330dd999d0c (patch) | |
| tree | eeb73eebfe9224956e8dde72b127872b23459dd5 /src/lib/dcp_subtitle_content.cc | |
| parent | 138882d651c5fb9d1dc66d092fcca7f3762a1226 (diff) | |
Account for split branch in libdcp.split
Diffstat (limited to 'src/lib/dcp_subtitle_content.cc')
| -rw-r--r-- | src/lib/dcp_subtitle_content.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc index b3e24d5e2..5458f1391 100644 --- a/src/lib/dcp_subtitle_content.cc +++ b/src/lib/dcp_subtitle_content.cc @@ -23,8 +23,8 @@ #include "film.h" #include "text_content.h" #include <dcp/raw_convert.h> -#include <dcp/interop_subtitle_asset.h> -#include <dcp/smpte_subtitle_asset.h> +#include <dcp/interop_text_asset.h> +#include <dcp/smpte_text_asset.h> #include <dcp/interop_load_font_node.h> #include <libxml++/libxml++.h> @@ -59,8 +59,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); } @@ -70,7 +70,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(); |