X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.h;h=792929419c42f36e091efe40ef583df3eb20b7d3;hb=9483ff5be32c31e3f78c7201c4519bedf822967c;hp=64112c1da964c8a86d16c90563b298254ac3767d;hpb=009e4abb14cfcaecc0de8fab179adc7bd5feffd4;p=dcpomatic.git

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 64112c1da..792929419 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -43,8 +43,6 @@ public:
 class VideoContent : public virtual Content
 {
 public:
-	typedef int Frame;
-
 	VideoContent (boost::shared_ptr<const Film>);
 	VideoContent (boost::shared_ptr<const Film>, DCPTime, ContentTime);
 	VideoContent (boost::shared_ptr<const Film>, boost::filesystem::path);
@@ -53,7 +51,6 @@ public:
 
 	void as_xml (xmlpp::Node *) const;
 	std::string technical_summary () const;
-	virtual std::string information () const;
 	virtual std::string identifier () const;
 
 	ContentTime video_length () const {
@@ -89,7 +86,7 @@ public:
 	void set_bottom_crop (int);
 
 	void set_scale (VideoContentScale);
-	void unset_colour_conversion ();
+	void unset_colour_conversion (bool signal = true);
 	void set_colour_conversion (ColourConversion);
 	void set_default_colour_conversion (bool signal = true);
 
@@ -137,6 +134,11 @@ public:
 		return _colour_conversion;
 	}
 
+	boost::optional<float> sample_aspect_ratio () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _sample_aspect_ratio;
+	}
+
 	ContentTime fade_in () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _fade_in;
@@ -178,6 +180,10 @@ private:
 	Crop _crop;
 	VideoContentScale _scale;
 	boost::optional<ColourConversion> _colour_conversion;
+	/** 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;
 };