Allow moving-still-image sources to have their frame rate specified.

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

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 72c72625b5c30a97927fdefe17b56c98492cf24f..141525e01b20b237184c32cf21bc49d7a21791d9 100644 (file)
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -42,9 +42,11 @@ class VideoContent : public virtual Content
 public:
        typedef int Frame;
 
+       VideoContent (boost::shared_ptr<const Film>);
        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 (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
 
        void as_xml (xmlpp::Node *) const;
        std::string technical_summary () const;
@@ -85,8 +87,29 @@ public:
                return _crop;
        }
 
+       int left_crop () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _crop.left;
+       }
+
+       int right_crop () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _crop.right;
+       }
+
+       int top_crop () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _crop.top;
+       }
+
+       int bottom_crop () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _crop.bottom;
+       }
+       
        void set_ratio (Ratio const *);
 
+       /** @return ratio to scale to, or 0 if the content's own ratio should be preserved. */
        Ratio const * ratio () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _ratio;
@@ -98,20 +121,25 @@ public:
        }
 
        libdcp::Size video_size_after_3d_split () const;
+       libdcp::Size video_size_after_crop () const;
+
+       VideoContent::Frame time_to_content_video_frames (Time) const;
 
 protected:
        void take_from_video_examiner (boost::shared_ptr<VideoExaminer>);
 
        VideoContent::Frame _video_length;
+       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;
+
+       void setup_default_colour_conversion ();
        
        libdcp::Size _video_size;
-       float _video_frame_rate;
        VideoFrameType _video_frame_type;
        Crop _crop;
        Ratio const * _ratio;