summaryrefslogtreecommitdiff
path: root/src/lib/video_content.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-11-21 01:59:04 +0000
committerCarl Hetherington <cth@carlh.net>2018-11-21 01:59:04 +0000
commit254b3044d72de6b033d7c584f5abd2b9aa70aad5 (patch)
tree8a5c83c1b2dea690672663dedb2f3aa50f4473dc /src/lib/video_content.h
parentc31b9542c58ae1cbfae7ec3ba4911359fd010ba2 (diff)
Take Film pointer out of Content.
Diffstat (limited to 'src/lib/video_content.h')
-rw-r--r--src/lib/video_content.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 774210c13..7ecc2813a 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -156,19 +156,19 @@ public:
dcp::Size size_after_3d_split () const;
dcp::Size size_after_crop () const;
- boost::optional<double> fade (Frame) const;
+ boost::optional<double> fade (boost::shared_ptr<const Film> film, Frame) const;
- void scale_and_crop_to_fit_width ();
- void scale_and_crop_to_fit_height ();
+ void scale_and_crop_to_fit_width (boost::shared_ptr<const Film> film);
+ void scale_and_crop_to_fit_height (boost::shared_ptr<const Film> film);
- std::string processing_description () const;
+ std::string processing_description (boost::shared_ptr<const Film> film) const;
void set_length (Frame);
void take_from_examiner (boost::shared_ptr<VideoExaminer>);
void add_properties (std::list<UserProperty> &) const;
- void modify_position (DCPTime& pos) const;
+ void modify_position (boost::shared_ptr<const Film> film, DCPTime& pos) const;
void modify_trim_start (ContentTime& pos) const;
static boost::shared_ptr<VideoContent> from_xml (Content* parent, cxml::ConstNodePtr, int);