Hand-apply 80562fe5dce5fd625da583ca6f7c2833f9db8754 from master (remove default scale...

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

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 64112c1da964c8a86d16c90563b298254ac3767d..30dcac231ffef8fe59455454a88d98b2f8792338 100644 (file)
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -137,6 +137,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;
@@ -178,6 +183,10 @@ private:
        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;
 };