X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.cc;h=af85e0ff08d17fcbf7fd4111ce27988d9fe405dd;hb=bb9d1f9e0f1aa818d1ac2145f05563e4c95d41b1;hp=8b611f6b63c0385794979b1d740a8c773d9d00f4;hpb=1858190cff2f960f3d1f0a5cc02c69da86088f5b;p=dcpomatic.git diff --git a/src/lib/content.cc b/src/lib/content.cc index 8b611f6b6..af85e0ff0 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -223,13 +223,11 @@ Content::technical_summary () const DCPTime Content::length_after_trim () const { - shared_ptr 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 includes everything about how this content affects - * its playlist. +/** @return string which changes when something about this content changes which affects + * the appearance of its video. */ string Content::identifier () const @@ -289,3 +287,11 @@ Content::properties () const add_properties (p); return p; } + +shared_ptr +Content::film () const +{ + shared_ptr film = _film.lock (); + DCPOMATIC_ASSERT (film); + return film; +}