Merge master.

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

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index b3c81d9c3eb807bbc3866d384141ce26f1aaff47..3c8e5fefd5a587d7d57ef8f885031197f461e977 100644 (file)
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -36,6 +36,8 @@ 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
@@ -87,7 +89,12 @@ public:
        void set_bottom_crop (int);
 
        void set_scale (VideoContentScale);
+       void unset_colour_conversion ();
        void set_colour_conversion (ColourConversion);
+       void set_default_colour_conversion ();
+
+       void set_fade_in (ContentTime);
+       void set_fade_out (ContentTime);
        
        VideoFrameType video_frame_type () const {
                boost::mutex::scoped_lock lm (_mutex);
@@ -125,16 +132,28 @@ public:
                return _scale;
        }
 
-       ColourConversion colour_conversion () const {
+       boost::optional<ColourConversion> colour_conversion () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _colour_conversion;
        }
 
+       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 ();
 
@@ -156,7 +175,9 @@ private:
        VideoFrameType _video_frame_type;
        Crop _crop;
        VideoContentScale _scale;
-       ColourConversion _colour_conversion;
+       boost::optional<ColourConversion> _colour_conversion;
+       ContentTime _fade_in;
+       ContentTime _fade_out;
 };
 
 #endif