diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-05-09 19:58:37 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-18 11:50:29 +0100 |
| commit | 19f94521139aac13ef8fb4eaa55855b2ada307b4 (patch) | |
| tree | 6e4b457c1fa46c674433fb1a5d2a9cd0f07c5a11 /src/lib/video_content.h | |
| parent | 0a2d40420813403a96352c6dc895d23fcd9994c0 (diff) | |
Move video frame rate ('prepared-for') into Content.
Diffstat (limited to 'src/lib/video_content.h')
| -rw-r--r-- | src/lib/video_content.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/lib/video_content.h b/src/lib/video_content.h index 432775651..03ffb0fa8 100644 --- a/src/lib/video_content.h +++ b/src/lib/video_content.h @@ -39,7 +39,6 @@ class VideoContentProperty { public: static int const SIZE; - static int const FRAME_RATE; static int const FRAME_TYPE; static int const CROP; static int const SCALE; @@ -78,18 +77,7 @@ public: return _size; } - double frame_rate () const; - - /** @return true if this content has a specific video frame rate, false - * if it should use the DCP's rate. - */ - bool has_own_frame_rate () const { - boost::mutex::scoped_lock lm (_mutex); - return static_cast<bool>(_frame_rate); - } - void set_frame_type (VideoFrameType); - void set_frame_rate (double); void set_left_crop (int); void set_right_crop (int); @@ -189,8 +177,6 @@ private: void setup_default_colour_conversion (); Frame _length; - /** Video frame rate, or not set if this content should use the DCP's frame rate */ - boost::optional<double> _frame_rate; boost::optional<ColourConversion> _colour_conversion; dcp::Size _size; VideoFrameType _frame_type; |