Merge master.

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

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 106adf959cf4ff43f3cd039acd15dd493a633533..8d901cbcdfa2d8b0a06745da2e0eabb4ccbf0943 100644 (file)
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -42,16 +42,18 @@ class VideoContent : public virtual Content
 public:
        typedef int Frame;
 
-       VideoContent (boost::shared_ptr<const Film>, Time, VideoContent::Frame);
+       VideoContent (boost::shared_ptr<const Film>);
+       VideoContent (boost::shared_ptr<const Film>, DCPTime, VideoFrame);
        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;
        virtual std::string information () const;
        virtual std::string identifier () const;
 
-       VideoContent::Frame video_length () const {
+       VideoFrame video_length () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _video_length;
        }
@@ -121,12 +123,13 @@ 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;
+       VideoFrame time_to_content_video_frames (DCPTime) const;
 
 protected:
        void take_from_video_examiner (boost::shared_ptr<VideoExaminer>);
 
-       VideoContent::Frame _video_length;
+       VideoFrame _video_length;
+       float _video_frame_rate;
 
 private:
        friend class ffmpeg_pts_offset_test;
@@ -137,7 +140,6 @@ private:
        void setup_default_colour_conversion ();
        
        libdcp::Size _video_size;
-       float _video_frame_rate;
        VideoFrameType _video_frame_type;
        Crop _crop;
        Ratio const * _ratio;