X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.h;h=01e3cb2aab7e876a571bde5f02efa44c43dfc2e1;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=abc9c5fa3e8db454c803b6de462eba4a809c56ef;hpb=387304bc9147933b68eda2b38ba8cac0d250e87e;p=dcpomatic.git diff --git a/src/lib/video_content.h b/src/lib/video_content.h index abc9c5fa3..01e3cb2aa 100644 --- a/src/lib/video_content.h +++ b/src/lib/video_content.h @@ -54,7 +54,7 @@ public: virtual std::string identifier () const; virtual void set_default_colour_conversion (); - + Frame video_length () const { boost::mutex::scoped_lock lm (_mutex); return _video_length; @@ -65,7 +65,7 @@ public: if (_video_frame_type == VIDEO_FRAME_TYPE_3D_ALTERNATE) { return _video_length / 2; } - + return _video_length; } @@ -73,7 +73,7 @@ public: boost::mutex::scoped_lock lm (_mutex); return _video_size; } - + float video_frame_rate () const { boost::mutex::scoped_lock lm (_mutex); return _video_frame_rate; @@ -93,7 +93,7 @@ public: void set_fade_in (Frame); void set_fade_out (Frame); - + VideoFrameType video_frame_type () const { boost::mutex::scoped_lock lm (_mutex); return _video_frame_type; @@ -149,7 +149,7 @@ public: boost::mutex::scoped_lock lm (_mutex); return _fade_out; } - + dcp::Size video_size_after_3d_split () const; dcp::Size video_size_after_crop () const; @@ -176,7 +176,7 @@ private: friend struct audio_sampling_rate_test; void setup_default_colour_conversion (); - + dcp::Size _video_size; VideoFrameType _video_frame_type; Crop _crop;