More player debugging for butler video-full states.

[dcpomatic.git] / src / lib / video_content.h

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 19ea113f76fed45232cf3e8e06ffc2a66beb8d2c..7ecc2813a067cf70f83509f5f1fe6aa23bf755ce 100644 (file)
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -51,13 +51,13 @@ public:
 class VideoContent : public ContentPart, public boost::enable_shared_from_this<VideoContent>
 {
 public:
-       VideoContent (Content* parent);
+       explicit VideoContent (Content* parent);
        VideoContent (Content* parent, std::vector<boost::shared_ptr<Content> >);
 
        void as_xml (xmlpp::Node *) const;
        std::string technical_summary () const;
        std::string identifier () const;
-       void use_template (boost::shared_ptr<const VideoContent> c);
+       void take_settings_from (boost::shared_ptr<const VideoContent> c);
 
        Frame length () const {
                boost::mutex::scoped_lock lm (_mutex);
@@ -156,19 +156,20 @@ 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);