Merge remote-tracking branch 'origin/main' into v2.17.x

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

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 495d000e160401a24059a4f355a92df3acc90f04..eb106cc75877cb7186da74f545dc210e265c8afb 100644 (file)
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -66,7 +66,7 @@ public:
        VideoContent (Content* parent, cxml::ConstNodePtr node, int version, VideoRange video_range_hint);
        VideoContent (Content* parent, std::vector<std::shared_ptr<Content>>);
 
-       void as_xml (xmlpp::Node *) const;
+       void as_xml(xmlpp::Element*) const;
        std::string technical_summary () const;
        std::string identifier () const;
        void take_settings_from (std::shared_ptr<const VideoContent> c);
@@ -208,7 +208,7 @@ public:
        boost::optional<dcp::Size> size_after_crop() const;
        boost::optional<dcp::Size> scaled_size(dcp::Size container_size);
 
-       boost::optional<double> fade (std::shared_ptr<const Film> film, Frame) const;
+       boost::optional<double> fade(std::shared_ptr<const Film> film, dcpomatic::ContentTime time) const;
 
        std::string processing_description (std::shared_ptr<const Film> film);