Untested use of Frame for video/audio content lengths.

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

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 3c8e5fefd5a587d7d57ef8f885031197f461e977..abc9c5fa3e8db454c803b6de462eba4a809c56ef 100644 (file)
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -43,28 +43,27 @@ public:
 class VideoContent : public virtual Content
 {
 public:
-       typedef int Frame;
-
        VideoContent (boost::shared_ptr<const Film>);
-       VideoContent (boost::shared_ptr<const Film>, DCPTime, ContentTime);
+       VideoContent (boost::shared_ptr<const Film>, DCPTime, Frame);
        VideoContent (boost::shared_ptr<const Film>, boost::filesystem::path);
        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;
        std::string technical_summary () const;
-       virtual std::string information () const;
        virtual std::string identifier () const;
 
-       ContentTime video_length () const {
+       virtual void set_default_colour_conversion ();
+       
+       Frame video_length () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _video_length;
        }
 
-       ContentTime video_length_after_3d_combine () const {
+       Frame video_length_after_3d_combine () const {
                boost::mutex::scoped_lock lm (_mutex);
                if (_video_frame_type == VIDEO_FRAME_TYPE_3D_ALTERNATE) {
-                       return ContentTime (_video_length.get() / 2);
+                       return _video_length / 2;
                }
                
                return _video_length;
@@ -89,12 +88,11 @@ public:
        void set_bottom_crop (int);
 
        void set_scale (VideoContentScale);
-       void unset_colour_conversion ();
+       void unset_colour_conversion (bool signal = true);
        void set_colour_conversion (ColourConversion);
-       void set_default_colour_conversion ();
 
-       void set_fade_in (ContentTime);
-       void set_fade_out (ContentTime);
+       void set_fade_in (Frame);
+       void set_fade_out (Frame);
        
        VideoFrameType video_frame_type () const {
                boost::mutex::scoped_lock lm (_mutex);
@@ -137,12 +135,17 @@ public:
                return _colour_conversion;
        }
 
-       ContentTime fade_in () const {
+       boost::optional<float> sample_aspect_ratio () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _sample_aspect_ratio;
+       }
+
+       Frame fade_in () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _fade_in;
        }
 
-       ContentTime fade_out () const {
+       Frame fade_out () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _fade_out;
        }
@@ -152,16 +155,19 @@ public:
 
        ContentTime dcp_time_to_content_time (DCPTime) const;
 
-       boost::optional<float> fade (VideoFrame) const;
+       boost::optional<float> fade (Frame) const;
 
        void scale_and_crop_to_fit_width ();
        void scale_and_crop_to_fit_height ();
 
+       std::string processing_description () const;
+
 protected:
        void take_from_video_examiner (boost::shared_ptr<VideoExaminer>);
 
-       ContentTime _video_length;
+       Frame _video_length;
        float _video_frame_rate;
+       boost::optional<ColourConversion> _colour_conversion;
 
 private:
        friend struct ffmpeg_pts_offset_test;
@@ -175,9 +181,12 @@ private:
        VideoFrameType _video_frame_type;
        Crop _crop;
        VideoContentScale _scale;
-       boost::optional<ColourConversion> _colour_conversion;
-       ContentTime _fade_in;
-       ContentTime _fade_out;
+       /** Sample aspect ratio obtained from the content file's header,
+           if there is one.
+       */
+       boost::optional<float> _sample_aspect_ratio;
+       Frame _fade_in;
+       Frame _fade_out;
 };
 
 #endif