diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-11-06 01:29:06 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-11-06 01:29:06 +0000 |
| commit | 188877db5362b9b630588b2dfee4002d71a29372 (patch) | |
| tree | 69e734955b92f9fb7b72b43209f3423b2966354e /src/lib/dcp_subtitle_content.cc | |
| parent | 9af90d8c2c88b86a2d6b7b9c4e7096e0ba4a4cf0 (diff) | |
Clean up a bit by using Content::film() more.
Diffstat (limited to 'src/lib/dcp_subtitle_content.cc')
| -rw-r--r-- | src/lib/dcp_subtitle_content.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc index 19f38c5f6..39f24b215 100644 --- a/src/lib/dcp_subtitle_content.cc +++ b/src/lib/dcp_subtitle_content.cc @@ -82,9 +82,7 @@ DCPSubtitleContent::examine (shared_ptr<Job> job) DCPTime DCPSubtitleContent::full_length () const { - shared_ptr<const Film> film = _film.lock (); - DCPOMATIC_ASSERT (film); - FrameRateChange const frc (subtitle_video_frame_rate(), film->video_frame_rate()); + FrameRateChange const frc (subtitle_video_frame_rate(), film()->video_frame_rate()); return DCPTime (_length, frc); } @@ -133,7 +131,5 @@ DCPSubtitleContent::subtitle_video_frame_rate () const /* No frame rate specified, so assume this content has been prepared for any concurrent video content. */ - shared_ptr<const Film> film = _film.lock (); - DCPOMATIC_ASSERT (film); - return film->active_frame_rate_change(position()).source; + return film()->active_frame_rate_change(position()).source; } |
