Merge master.

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

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 9404676808504d912814e70673d9d28e348826bb..d32769b5a9dde2ec41128207983e04b9721b8c0e 100644 (file)
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -43,9 +43,9 @@ public:
        VideoContentScale ();
        VideoContentScale (Ratio const *);
        VideoContentScale (bool);
-       VideoContentScale (boost::shared_ptr<cxml::Node>);
+       VideoContentScale (cxml::NodePtr);
 
-       libdcp::Size size (boost::shared_ptr<const VideoContent>, libdcp::Size, libdcp::Size) const;
+       dcp::Size size (boost::shared_ptr<const VideoContent>, dcp::Size, dcp::Size, int round) const;
        std::string id () const;
        std::string name () const;
        void as_xml (xmlpp::Node *) const;
@@ -82,9 +82,9 @@ 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>, 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;
@@ -92,21 +92,21 @@ public:
        virtual std::string information () const;
        virtual std::string identifier () const;
 
-       VideoContent::Frame video_length () const {
+       ContentTime video_length () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _video_length;
        }
 
-       VideoContent::Frame video_length_after_3d_combine () const {
+       ContentTime video_length_after_3d_combine () const {
                boost::mutex::scoped_lock lm (_mutex);
                if (_video_frame_type == VIDEO_FRAME_TYPE_3D_ALTERNATE) {
-                       return _video_length / 2;
+                       return ContentTime (_video_length.get() / 2);
                }
                
                return _video_length;
        }
 
-       libdcp::Size video_size () const {
+       dcp::Size video_size () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _video_size;
        }
@@ -116,11 +116,6 @@ public:
                return _video_frame_rate;
        }
 
-       float original_video_frame_rate () const {
-               boost::mutex::scoped_lock lm (_mutex);
-               return _original_video_frame_rate;
-       }
-       
        void set_video_frame_type (VideoFrameType);
        void set_video_frame_rate (float);
 
@@ -173,10 +168,10 @@ public:
                return _colour_conversion;
        }
 
-       libdcp::Size video_size_after_3d_split () const;
-       libdcp::Size video_size_after_crop () const;
+       dcp::Size video_size_after_3d_split () const;
+       dcp::Size video_size_after_crop () const;
 
-       VideoContent::Frame time_to_content_video_frames (Time) const;
+       ContentTime dcp_time_to_content_time (DCPTime) const;
 
        void scale_and_crop_to_fit_width ();
        void scale_and_crop_to_fit_height ();
@@ -184,19 +179,18 @@ public:
 protected:
        void take_from_video_examiner (boost::shared_ptr<VideoExaminer>);
 
-       VideoContent::Frame _video_length;
-       float _original_video_frame_rate;
+       ContentTime _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;
+       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 ();
        
-       libdcp::Size _video_size;
+       dcp::Size _video_size;
        VideoFrameType _video_frame_type;
        Crop _crop;
        VideoContentScale _scale;