Change how video timing is done.

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

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index ce645bb41fd714c8c6ad5c0b1c734827bbbee9a6..5a3aabe8252d17e62bc53d3bf6ae25efd488d300 100644 (file)
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -60,7 +60,7 @@ class VideoContent : public ContentPart, public std::enable_shared_from_this<Vid
 {
 public:
        explicit VideoContent (Content* parent);
-       VideoContent (Content* parent, cxml::ConstNodePtr, int);
+       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;
@@ -89,6 +89,7 @@ public:
 
        void set_frame_type (VideoFrameType);
 
+       void set_crop (Crop crop);
        void set_left_crop (int);
        void set_right_crop (int);
        void set_top_crop (int);
@@ -183,6 +184,11 @@ public:
                return _range;
        }
 
+       PixelQuanta pixel_quanta () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _pixel_quanta;
+       }
+
        bool use () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _use;
@@ -199,7 +205,7 @@ public:
        dcp::Size size_after_crop () const;
        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);
 
@@ -211,7 +217,7 @@ public:
        void modify_position (std::shared_ptr<const Film> film, dcpomatic::DCPTime& pos) const;
        void modify_trim_start (dcpomatic::ContentTime& pos) const;
 
-       static std::shared_ptr<VideoContent> from_xml (Content* parent, cxml::ConstNodePtr, int);
+       static std::shared_ptr<VideoContent> from_xml (Content* parent, cxml::ConstNodePtr node, int version, VideoRange video_range_hint);
 
 private: