Add video_{range,frame_type}.{cc,h} and remove some types.h includes.

[dcpomatic.git] / src / lib / video_content.h

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 3ec88457823f980bd9ea62b3abf1a4337251ac71..3ef8b277592eaf7f04944ef08cdfe4b294c11c9e 100644 (file)
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -25,10 +25,12 @@
 
 #include "colour_conversion.h"
 #include "content_part.h"
+#include "crop.h"
 #include "dcpomatic_time.h"
 #include "pixel_quanta.h"
-#include "types.h"
 #include "user_property.h"
+#include "video_frame_type.h"
+#include "video_range.h"
 #include <dcp/language_tag.h>
 #include <boost/thread/mutex.hpp>
 
@@ -89,6 +91,7 @@ public:
 
        void set_frame_type (VideoFrameType);
 
+       void set_crop (Crop crop);
        void set_left_crop (int);
        void set_right_crop (int);
        void set_top_crop (int);
@@ -210,7 +213,7 @@ public:
 
        void set_length (Frame);
 
-       void take_from_examiner (std::shared_ptr<VideoExaminer>);
+       void take_from_examiner(std::shared_ptr<const Film> film, std::shared_ptr<VideoExaminer>);
        void add_properties (std::list<UserProperty> &) const;
 
        void modify_position (std::shared_ptr<const Film> film, dcpomatic::DCPTime& pos) const;