11b5bf6229b8713dffde89a777cd5181335136f6 from master; default colour conversions...

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

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 64112c1da964c8a86d16c90563b298254ac3767d..ccc61b1f9eba3f15b7cc4521609642545874be45 100644 (file)
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -43,8 +43,6 @@ 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>, boost::filesystem::path);
@@ -53,9 +51,10 @@ public:
 
        void as_xml (xmlpp::Node *) const;
        std::string technical_summary () const;
-       virtual std::string information () 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;
@@ -89,9 +88,8 @@ 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 (bool signal = true);
 
        void set_fade_in (ContentTime);
        void set_fade_out (ContentTime);
@@ -137,6 +135,11 @@ public:
                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;
@@ -164,6 +167,7 @@ protected:
 
        ContentTime _video_length;
        float _video_frame_rate;
+       boost::optional<ColourConversion> _colour_conversion;
 
 private:
        friend struct ffmpeg_pts_offset_test;
@@ -177,7 +181,10 @@ private:
        VideoFrameType _video_frame_type;
        Crop _crop;
        VideoContentScale _scale;
-       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;
 };