X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.h;h=ccc61b1f9eba3f15b7cc4521609642545874be45;hb=8167d04e4dde6297ad936dca5dc691818a4dae41;hp=792929419c42f36e091efe40ef583df3eb20b7d3;hpb=35466aa2bf59544d436a5f576e81856c5e0d0311;p=dcpomatic.git diff --git a/src/lib/video_content.h b/src/lib/video_content.h index 792929419..ccc61b1f9 100644 --- a/src/lib/video_content.h +++ b/src/lib/video_content.h @@ -53,6 +53,8 @@ public: std::string technical_summary () const; virtual std::string identifier () const; + virtual void set_default_colour_conversion (); + ContentTime video_length () const { boost::mutex::scoped_lock lm (_mutex); return _video_length; @@ -88,7 +90,6 @@ public: 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); @@ -166,6 +167,7 @@ protected: ContentTime _video_length; float _video_frame_rate; + boost::optional _colour_conversion; private: friend struct ffmpeg_pts_offset_test; @@ -179,7 +181,6 @@ private: VideoFrameType _video_frame_type; Crop _crop; VideoContentScale _scale; - boost::optional _colour_conversion; /** Sample aspect ratio obtained from the content file's header, if there is one. */