summaryrefslogtreecommitdiff
path: root/src/lib/video_content.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/video_content.h')
-rw-r--r--src/lib/video_content.h10
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: