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/content.cc | |
| parent | 9af90d8c2c88b86a2d6b7b9c4e7096e0ba4a4cf0 (diff) | |
Clean up a bit by using Content::film() more.
Diffstat (limited to 'src/lib/content.cc')
| -rw-r--r-- | src/lib/content.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/lib/content.cc b/src/lib/content.cc index aa596f75a..af85e0ff0 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -223,9 +223,7 @@ Content::technical_summary () const DCPTime Content::length_after_trim () const { - shared_ptr<const Film> film = _film.lock (); - DCPOMATIC_ASSERT (film); - return max (DCPTime (), full_length() - DCPTime (trim_start() + trim_end(), film->active_frame_rate_change (position ()))); + return max (DCPTime (), full_length() - DCPTime (trim_start() + trim_end(), film()->active_frame_rate_change (position ()))); } /** @return string which changes when something about this content changes which affects @@ -289,3 +287,11 @@ Content::properties () const add_properties (p); return p; } + +shared_ptr<const Film> +Content::film () const +{ + shared_ptr<const Film> film = _film.lock (); + DCPOMATIC_ASSERT (film); + return film; +} |