Merge master.

1 files changed, 11 insertions, 0 deletions

diff --git a/src/lib/config.h b/src/lib/config.h
index ee11dcadb..ffaacf8f1 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -116,6 +116,10 @@ public:
 	std::list<int> allowed_dcp_frame_rates () const {
 		return _allowed_dcp_frame_rates;
 	}
+
+	bool allow_any_dcp_frame_rate () const {
+		return _allow_any_dcp_frame_rate;
+	}
 	
 	DCIMetadata default_dci_metadata () const {
 		return _default_dci_metadata;
@@ -241,6 +245,11 @@ public:
 		changed ();
 	}
 
+	void set_allow_any_dcp_frame_rate (bool a) {
+		_allow_any_dcp_frame_rate = a;
+		changed ();
+	}
+
 	void set_default_dci_metadata (DCIMetadata d) {
 		_default_dci_metadata = d;
 		changed ();
@@ -369,6 +378,8 @@ private:
 	/** Our sound processor */
 	SoundProcessor const * _sound_processor;
 	std::list<int> _allowed_dcp_frame_rates;
+	/** Allow any video frame rate for the DCP; if true, overrides _allowed_dcp_frame_rates */
+	bool _allow_any_dcp_frame_rate;
 	/** Default DCI metadata for newly-created Films */
 	DCIMetadata _default_dci_metadata;
 	boost::optional<std::string> _language;