X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.h;h=b3c81d9c3eb807bbc3866d384141ce26f1aaff47;hb=946dbad9821e676f1d8fdc5abba459da54b8e84c;hp=6b91997c9f4076c91ffdd9d536ee21106bc0e9d0;hpb=034feb503b0a38eb82c21ae8d9f83522fc63a25c;p=dcpomatic.git

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 6b91997c9..b3c81d9c3 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -22,6 +22,7 @@
 
 #include "content.h"
 #include "colour_conversion.h"
+#include "video_content_scale.h"
 
 class VideoExaminer;
 class Ratio;
@@ -37,44 +38,6 @@ public:
 	static int const COLOUR_CONVERSION;
 };
 
-class VideoContentScale
-{
-public:
-	VideoContentScale ();
-	VideoContentScale (Ratio const *);
-	VideoContentScale (bool);
-	VideoContentScale (boost::shared_ptr<cxml::Node>);
-
-	dcp::Size size (boost::shared_ptr<const VideoContent>, dcp::Size, dcp::Size) const;
-	std::string id () const;
-	std::string name () const;
-	void as_xml (xmlpp::Node *) const;
-
-	Ratio const * ratio () const {
-		return _ratio;
-	}
-
-	bool scale () const {
-		return _scale;
-	}
-
-	static void setup_scales ();
-	static std::vector<VideoContentScale> all () {
-		return _scales;
-	}
-
-private:
-	/** a ratio to stretch the content to, or 0 for no stretch */
-	Ratio const * _ratio;
-	/** true if we want to scale the content */
-	bool _scale;
-
-	static std::vector<VideoContentScale> _scales;
-};
-
-bool operator== (VideoContentScale const & a, VideoContentScale const & b);
-bool operator!= (VideoContentScale const & a, VideoContentScale const & b);
-
 class VideoContent : public virtual Content
 {
 public:
@@ -83,7 +46,7 @@ public:
 	VideoContent (boost::shared_ptr<const Film>);
 	VideoContent (boost::shared_ptr<const Film>, DCPTime, ContentTime);
 	VideoContent (boost::shared_ptr<const Film>, boost::filesystem::path);
-	VideoContent (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>, int);
+	VideoContent (boost::shared_ptr<const Film>, cxml::ConstNodePtr, int);
 	VideoContent (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
 
 	void as_xml (xmlpp::Node *) const;
@@ -116,6 +79,7 @@ public:
 	}
 
 	void set_video_frame_type (VideoFrameType);
+	void set_video_frame_rate (float);
 
 	void set_left_crop (int);
 	void set_right_crop (int);
@@ -171,6 +135,9 @@ public:
 
 	ContentTime dcp_time_to_content_time (DCPTime) const;
 
+	void scale_and_crop_to_fit_width ();
+	void scale_and_crop_to_fit_height ();
+
 protected:
 	void take_from_video_examiner (boost::shared_ptr<VideoExaminer>);
 
@@ -178,10 +145,10 @@ protected:
 	float _video_frame_rate;
 
 private:
-	friend class ffmpeg_pts_offset_test;
-	friend class best_dcp_frame_rate_test_single;
-	friend class best_dcp_frame_rate_test_double;
-	friend class audio_sampling_rate_test;
+	friend struct ffmpeg_pts_offset_test;
+	friend struct best_dcp_frame_rate_test_single;
+	friend struct best_dcp_frame_rate_test_double;
+	friend struct audio_sampling_rate_test;
 
 	void setup_default_colour_conversion ();