X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.h;h=372cab3bd3c48ab5874188800cf7b41e541ebea0;hb=09a9ac376db005a40a351736bcff4077f098825d;hp=ce2550d12d8f2ca4059d3f5860402482d1e1c65e;hpb=6166c045a8de42edd09924fdd995a77a3b753e54;p=dcpomatic.git

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index ce2550d12..372cab3bd 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -21,9 +21,9 @@
 #define DCPOMATIC_VIDEO_CONTENT_H
 
 #include "content.h"
-#include "util.h"
 
-class VideoDecoder;
+class VideoExaminer;
+class Ratio;
 
 class VideoContentProperty
 {
@@ -31,12 +31,15 @@ public:
 	static int const VIDEO_SIZE;
 	static int const VIDEO_FRAME_RATE;
 	static int const VIDEO_CROP;
+	static int const VIDEO_RATIO;
 };
 
 class VideoContent : public virtual Content
 {
 public:
-	VideoContent (boost::shared_ptr<const Film>, Time, ContentVideoFrame);
+	typedef int Frame;
+
+	VideoContent (boost::shared_ptr<const Film>, Time, VideoContent::Frame);
 	VideoContent (boost::shared_ptr<const Film>, boost::filesystem::path);
 	VideoContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>);
 	VideoContent (VideoContent const &);
@@ -44,7 +47,7 @@ public:
 	void as_xml (xmlpp::Node *) const;
 	virtual std::string information () const;
 
-	ContentVideoFrame video_length () const {
+	VideoContent::Frame video_length () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _video_length;
 	}
@@ -70,15 +73,23 @@ public:
 		return _crop;
 	}
 
+	void set_ratio (Ratio const *);
+
+	Ratio const * ratio () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _ratio;
+	}
+
 protected:
-	void take_from_video_decoder (boost::shared_ptr<VideoDecoder>);
+	void take_from_video_examiner (boost::shared_ptr<VideoExaminer>);
 
-	ContentVideoFrame _video_length;
+	VideoContent::Frame _video_length;
 
 private:
 	libdcp::Size _video_size;
 	float _video_frame_rate;
 	Crop _crop;
+	Ratio const * _ratio;
 };
 
 #endif