diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-11-06 01:10:27 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-11-06 01:10:27 +0000 |
| commit | 9af90d8c2c88b86a2d6b7b9c4e7096e0ba4a4cf0 (patch) | |
| tree | 08e66842b8158bec53b2e6fdd2afbfc2d5bbf737 /src/lib/video_content.h | |
| parent | aedaebb9a265128110085d3ca0ad5604409f0ddb (diff) | |
Allow single-frame image contents to adjust their video frame rates to that of the DCP (fixes #714).
Diffstat (limited to 'src/lib/video_content.h')
| -rw-r--r-- | src/lib/video_content.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/lib/video_content.h b/src/lib/video_content.h index c0a609a6a..aa541fc32 100644 --- a/src/lib/video_content.h +++ b/src/lib/video_content.h @@ -79,7 +79,12 @@ public: return _video_size; } - double video_frame_rate () const { + double video_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_video_frame_rate () const { boost::mutex::scoped_lock lm (_mutex); return _video_frame_rate; } @@ -172,7 +177,8 @@ protected: void add_properties (std::list<std::pair<std::string, std::string> > &) const; Frame _video_length; - double _video_frame_rate; + /** Video frame rate, or not set if this content should use the DCP's frame rate */ + boost::optional<double> _video_frame_rate; boost::optional<ColourConversion> _colour_conversion; private: |