X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.h;h=e7e8eb1b3d3d6f35c68169bc71677ffddf0632e7;hb=3ffd0163026be24e5373e0674c3301ed37546e44;hp=9f6cc105ea42155fec19d9776ff016a368e96280;hpb=0185ba27b0e9c52a173147c1380ec5f345109afc;p=dcpomatic.git diff --git a/src/lib/video_content.h b/src/lib/video_content.h index 9f6cc105e..e7e8eb1b3 100644 --- a/src/lib/video_content.h +++ b/src/lib/video_content.h @@ -85,7 +85,7 @@ public: return _length; } - dcp::Size size () const { + boost::optional size () const { boost::mutex::scoped_lock lm (_mutex); return _size; } @@ -204,9 +204,9 @@ public: /* XXX: names for these? */ - dcp::Size size_after_3d_split () const; - dcp::Size size_after_crop () const; - dcp::Size scaled_size (dcp::Size container_size); + boost::optional size_after_3d_split() const; + boost::optional size_after_crop() const; + boost::optional scaled_size(dcp::Size container_size); boost::optional fade (std::shared_ptr film, Frame) const; @@ -237,7 +237,7 @@ private: bool _use; Frame _length; boost::optional _colour_conversion; - dcp::Size _size; + boost::optional _size; VideoFrameType _frame_type; Crop _crop; /** ratio to scale cropped image to (or none to guess); i.e. if set, scale to _custom_ratio:1 */