Merge.

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

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index b3c81d9c3eb807bbc3866d384141ce26f1aaff47..792929419c42f36e091efe40ef583df3eb20b7d3 100644 (file)
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -36,13 +36,13 @@ public:
        static int const VIDEO_CROP;
        static int const VIDEO_SCALE;
        static int const COLOUR_CONVERSION;
+       static int const VIDEO_FADE_IN;
+       static int const VIDEO_FADE_OUT;
 };
 
 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>, boost::filesystem::path);
@@ -51,7 +51,6 @@ public:
 
        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 {
@@ -87,7 +86,12 @@ public:
        void set_bottom_crop (int);
 
        void set_scale (VideoContentScale);
+       void unset_colour_conversion (bool signal = true);
        void set_colour_conversion (ColourConversion);
+       void set_default_colour_conversion (bool signal = true);
+
+       void set_fade_in (ContentTime);
+       void set_fade_out (ContentTime);
        
        VideoFrameType video_frame_type () const {
                boost::mutex::scoped_lock lm (_mutex);
@@ -125,19 +129,38 @@ public:
                return _scale;
        }
 
-       ColourConversion colour_conversion () const {
+       boost::optional<ColourConversion> colour_conversion () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _colour_conversion;
        }
 
+       boost::optional<float> sample_aspect_ratio () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _sample_aspect_ratio;
+       }
+
+       ContentTime fade_in () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _fade_in;
+       }
+
+       ContentTime fade_out () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _fade_out;
+       }
+       
        dcp::Size video_size_after_3d_split () const;
        dcp::Size video_size_after_crop () const;
 
        ContentTime dcp_time_to_content_time (DCPTime) const;
 
+       boost::optional<float> fade (VideoFrame) 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>);
 
@@ -156,7 +179,13 @@ private:
        VideoFrameType _video_frame_type;
        Crop _crop;
        VideoContentScale _scale;
-       ColourConversion _colour_conversion;
+       boost::optional<ColourConversion> _colour_conversion;
+       /** Sample aspect ratio obtained from the content file's header,
+           if there is one.
+       */
+       boost::optional<float> _sample_aspect_ratio;
+       ContentTime _fade_in;
+       ContentTime _fade_out;
 };
 
 #endif