X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fvideo_content.h;h=37223c45788eef070d5ab5780a761e40f763f663;hp=412d4d034d96e032676d96c5baf386da1bca8aac;hb=5eb8b5c3a1566aef638e9d9df03b88d320735092;hpb=14c5566fe90b2584c7474c3250e6506d70e81510

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 412d4d034..37223c457 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -39,6 +39,7 @@ class Content;
 class VideoContentProperty
 {
 public:
+	static int const USE;
 	static int const SIZE;
 	static int const FRAME_TYPE;
 	static int const CROP;
@@ -46,18 +47,19 @@ public:
 	static int const COLOUR_CONVERSION;
 	static int const FADE_IN;
 	static int const FADE_OUT;
+	static int const RANGE;
 };
 
 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);
@@ -92,6 +94,9 @@ public:
 	void set_fade_in (Frame);
 	void set_fade_out (Frame);
 
+	void set_range (VideoRange);
+	void set_use (bool);
+
 	VideoFrameType frame_type () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _frame_type;
@@ -153,23 +158,33 @@ public:
 		return _fade_out;
 	}
 
+	VideoRange range () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _range;
+	}
+
+	bool use () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _use;
+	}
+
 	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_trim_start (ContentTime& pos) const;
+	void modify_position (boost::shared_ptr<const Film> film, dcpomatic::DCPTime& pos) const;
+	void modify_trim_start (dcpomatic::ContentTime& pos) const;
 
 	static boost::shared_ptr<VideoContent> from_xml (Content* parent, cxml::ConstNodePtr, int);
 
@@ -183,6 +198,7 @@ private:
 	VideoContent (Content* parent, cxml::ConstNodePtr, int);
 	void setup_default_colour_conversion ();
 
+	bool _use;
 	Frame _length;
 	boost::optional<ColourConversion> _colour_conversion;
 	dcp::Size _size;
@@ -192,8 +208,11 @@ private:
 	/** Sample aspect ratio obtained from the content file's header, if there is one */
 	boost::optional<double> _sample_aspect_ratio;
 	bool _yuv;
+	/** fade in time in content frames */
 	Frame _fade_in;
+	/** fade out time in content frames */
 	Frame _fade_out;
+	VideoRange _range;
 };
 
 #endif