X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.h;h=f7689763ff363216486ae6d567a2174bba64614d;hb=390d538dd07554b7e8f8f7dd0500d7f359509828;hp=72bad21f8dd987b089e185529771e21a313466a6;hpb=f188128e2577942f030374631d3cf1324a00624a;p=dcpomatic.git

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 72bad21f8..f7689763f 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -44,7 +44,7 @@ class VideoContent : public virtual Content
 {
 public:
 	VideoContent (boost::shared_ptr<const Film>);
-	VideoContent (boost::shared_ptr<const Film>, DCPTime, ContentTime);
+	VideoContent (boost::shared_ptr<const Film>, DCPTime, Frame);
 	VideoContent (boost::shared_ptr<const Film>, boost::filesystem::path);
 	VideoContent (boost::shared_ptr<const Film>, cxml::ConstNodePtr, int);
 	VideoContent (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
@@ -54,18 +54,18 @@ public:
 	virtual std::string identifier () const;
 
 	virtual void set_default_colour_conversion ();
-	
-	ContentTime video_length () const {
+
+	Frame video_length () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _video_length;
 	}
 
-	ContentTime video_length_after_3d_combine () const {
+	Frame video_length_after_3d_combine () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		if (_video_frame_type == VIDEO_FRAME_TYPE_3D_ALTERNATE) {
-			return ContentTime (_video_length.get() / 2);
+			return _video_length / 2;
 		}
-		
+
 		return _video_length;
 	}
 
@@ -73,14 +73,14 @@ public:
 		boost::mutex::scoped_lock lm (_mutex);
 		return _video_size;
 	}
-	
-	float video_frame_rate () const {
+
+	double video_frame_rate () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _video_frame_rate;
 	}
 
 	void set_video_frame_type (VideoFrameType);
-	void set_video_frame_rate (float);
+	void set_video_frame_rate (double);
 
 	void set_left_crop (int);
 	void set_right_crop (int);
@@ -88,12 +88,12 @@ public:
 	void set_bottom_crop (int);
 
 	void set_scale (VideoContentScale);
-	void unset_colour_conversion (bool signal = true);
+	void unset_colour_conversion ();
 	void set_colour_conversion (ColourConversion);
 
-	void set_fade_in (ContentTime);
-	void set_fade_out (ContentTime);
-	
+	void set_fade_in (Frame);
+	void set_fade_out (Frame);
+
 	VideoFrameType video_frame_type () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _video_frame_type;
@@ -135,27 +135,27 @@ public:
 		return _colour_conversion;
 	}
 
-	boost::optional<float> sample_aspect_ratio () const {
+	boost::optional<double> sample_aspect_ratio () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _sample_aspect_ratio;
 	}
 
-	ContentTime fade_in () const {
+	Frame fade_in () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _fade_in;
 	}
 
-	ContentTime fade_out () const {
+	Frame fade_out () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _fade_out;
 	}
-	
+
 	dcp::Size video_size_after_3d_split () const;
 	dcp::Size video_size_after_crop () const;
 
 	ContentTime dcp_time_to_content_time (DCPTime) const;
 
-	boost::optional<float> fade (Frame) const;
+	boost::optional<double> fade (Frame) const;
 
 	void scale_and_crop_to_fit_width ();
 	void scale_and_crop_to_fit_height ();
@@ -164,9 +164,10 @@ public:
 
 protected:
 	void take_from_video_examiner (boost::shared_ptr<VideoExaminer>);
+	void add_properties (std::list<std::pair<std::string, std::string> > &) const;
 
-	ContentTime _video_length;
-	float _video_frame_rate;
+	Frame _video_length;
+	double _video_frame_rate;
 	boost::optional<ColourConversion> _colour_conversion;
 
 private:
@@ -176,7 +177,7 @@ private:
 	friend struct audio_sampling_rate_test;
 
 	void setup_default_colour_conversion ();
-	
+
 	dcp::Size _video_size;
 	VideoFrameType _video_frame_type;
 	Crop _crop;
@@ -184,9 +185,9 @@ private:
 	/** Sample aspect ratio obtained from the content file's header,
 	    if there is one.
 	*/
-	boost::optional<float> _sample_aspect_ratio;
-	ContentTime _fade_in;
-	ContentTime _fade_out;
+	boost::optional<double> _sample_aspect_ratio;
+	Frame _fade_in;
+	Frame _fade_out;
 };
 
 #endif