summaryrefslogtreecommitdiff
path: root/src/lib/dcp_subtitle_content.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-04-14 02:06:18 +0100
committerCarl Hetherington <cth@carlh.net>2016-05-18 11:50:29 +0100
commit2d5beb0d6794df13ad1df47e84fd7a57d1d1c64d (patch)
tree70034dc6789e55394dac0ec87b968c58b96e4b48 /src/lib/dcp_subtitle_content.cc
parent826ed68a1e34ce158342da324ff7203af0449641 (diff)
Rename video/audio/subtitle part methods.
Diffstat (limited to 'src/lib/dcp_subtitle_content.cc')
-rw-r--r--src/lib/dcp_subtitle_content.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc
index 3feb8947a..eabcaaafe 100644
--- a/src/lib/dcp_subtitle_content.cc
+++ b/src/lib/dcp_subtitle_content.cc
@@ -56,18 +56,18 @@ DCPSubtitleContent::examine (shared_ptr<Job> job)
shared_ptr<dcp::SubtitleAsset> sc = load (path (0));
/* Default to turning these subtitles on */
- subtitle->set_use_subtitles (true);
+ subtitle->set_use (true);
boost::mutex::scoped_lock lm (_mutex);
shared_ptr<dcp::InteropSubtitleAsset> iop = dynamic_pointer_cast<dcp::InteropSubtitleAsset> (sc);
if (iop) {
- subtitle->set_subtitle_language (iop->language ());
+ subtitle->set_language (iop->language ());
}
shared_ptr<dcp::SMPTESubtitleAsset> smpte = dynamic_pointer_cast<dcp::SMPTESubtitleAsset> (sc);
if (smpte) {
- subtitle->set_subtitle_language (smpte->language().get_value_or (""));
- subtitle->set_subtitle_video_frame_rate (smpte->edit_rate().numerator);
+ subtitle->set_language (smpte->language().get_value_or (""));
+ subtitle->set_video_frame_rate (smpte->edit_rate().numerator);
}
_length = ContentTime::from_seconds (sc->latest_subtitle_out().as_seconds ());
@@ -80,7 +80,7 @@ DCPSubtitleContent::examine (shared_ptr<Job> job)
DCPTime
DCPSubtitleContent::full_length () const
{
- FrameRateChange const frc (subtitle->subtitle_video_frame_rate(), film()->video_frame_rate());
+ FrameRateChange const frc (subtitle->video_frame_rate(), film()->video_frame_rate());
return DCPTime (_length, frc);
}