summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2023-10-14 21:41:15 +0200
committerCarl Hetherington <cth@carlh.net>2023-10-14 21:41:15 +0200
commit024cce26dd944c789da1ae32dde7f8acb0a38438 (patch)
tree2bc185e682c3e68f517eb124d102e6cbd0685f3c
parentdaf0a05178ac6370440594e124bc25162f053176 (diff)
Cleanup: rename sc -> subtitle_asset
-rw-r--r--src/lib/dcp_subtitle_content.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc
index 8908d34e6..e9db5546c 100644
--- a/src/lib/dcp_subtitle_content.cc
+++ b/src/lib/dcp_subtitle_content.cc
@@ -57,10 +57,10 @@ DCPSubtitleContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
{
Content::examine (film, job);
- auto sc = load (path(0));
+ auto subtitle_asset = load(path(0));
- auto iop = dynamic_pointer_cast<dcp::InteropSubtitleAsset>(sc);
- auto smpte = dynamic_pointer_cast<dcp::SMPTESubtitleAsset>(sc);
+ auto iop = dynamic_pointer_cast<dcp::InteropSubtitleAsset>(subtitle_asset);
+ auto smpte = dynamic_pointer_cast<dcp::SMPTESubtitleAsset>(subtitle_asset);
if (smpte) {
set_video_frame_rate(film, smpte->edit_rate().numerator);
}
@@ -70,12 +70,12 @@ 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 (sc->latest_subtitle_out().as_seconds());
+ _length = ContentTime::from_seconds(subtitle_asset->latest_subtitle_out().as_seconds());
- sc->fix_empty_font_ids ();
+ subtitle_asset->fix_empty_font_ids();
- auto font_data = sc->font_data();
- for (auto node: sc->load_font_nodes()) {
+ auto font_data = subtitle_asset->font_data();
+ for (auto node: subtitle_asset->load_font_nodes()) {
auto data = font_data.find(node->id);
if (data != font_data.end()) {
only_text()->add_font(make_shared<Font>(node->id, data->second));