X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=cd3b1b8a8dac19c830c088bc383afbb5cbadad4f;hb=3781be4da4601176d7bb954f9cc65621d75e7344;hp=f214d411fbd8f8ca3ee5300b2434230b82507e1f;hpb=f7c9b384e63dd8917b619d1a66b0cc95c3bf5649;p=dcpomatic.git

diff --git a/src/lib/film.h b/src/lib/film.h
index f214d411f..cd3b1b8a8 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -29,6 +29,7 @@
 #include <vector>
 #include <inttypes.h>
 #include <boost/thread/mutex.hpp>
+#include <boost/thread.hpp>
 #include <sigc++/signal.h>
 extern "C" {
 #include <libavcodec/avcodec.h>
@@ -70,24 +71,9 @@ public:
 		return _state.name;
 	}
 
-	/** @return number of pixels to crop from the top of the original picture */
-	int top_crop () const {
-		return _state.top_crop;
-	}
-
-	/** @return number of pixels to crop from the bottom of the original picture */
-	int bottom_crop () const {
-		return _state.bottom_crop;
-	}
-
-	/** @return number of pixels to crop from the left-hand side of the original picture */
-	int left_crop () const {
-		return _state.left_crop;
-	}
-
-	/** @return number of pixels to crop from the right-hand side of the original picture */
-	int right_crop () const {
-		return _state.right_crop;
+	/** @return number of pixels to crop from the sides of the original picture */
+	Crop crop () const {
+		return _state.crop;
 	}
 
 	/** @return the format to present this film in (flat, scope, etc.) */
@@ -153,7 +139,6 @@ public:
 	void set_bottom_crop (int);
 	void set_left_crop (int);
 	void set_right_crop (int);
-	void set_frames_per_second (float);
 	void set_format (Format const *);
 	void set_dcp_content_type (DCPContentType const *);
 	void set_audio_gain (float);
@@ -219,10 +204,7 @@ public:
 		CONTENT,
 		DCP_CONTENT_TYPE,
 		FORMAT,
-		LEFT_CROP,
-		RIGHT_CROP,
-		TOP_CROP,
-		BOTTOM_CROP,
+		CROP,
 		FILTERS,
 		SCALER,
 		DCP_FRAMES,
@@ -248,6 +230,8 @@ public:
 		return _log;
 	}
 
+	int encoded_frames () const;
+
 	/** Emitted when some metadata property has changed */
 	mutable sigc::signal1<void, Property> Changed;