Merge remote-tracking branch 'origin/master' into 1.0

1 files changed, 10 insertions, 0 deletions

diff --git a/src/lib/config.h b/src/lib/config.h
index 66ff66214..03dd9c0fe 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -132,6 +132,10 @@ public:
 		return _default_still_length;
 	}
 
+	Ratio const * default_scale () const {
+		return _default_scale;
+	}
+
 	Ratio const * default_container () const {
 		return _default_container;
 	}
@@ -281,6 +285,11 @@ public:
 		changed ();
 	}
 
+	void set_default_scale (Ratio const * s) {
+		_default_scale = s;
+		changed ();
+	}
+
 	void set_default_container (Ratio const * c) {
 		_default_container = c;
 		changed ();
@@ -411,6 +420,7 @@ private:
 	ISDCFMetadata _default_isdcf_metadata;
 	boost::optional<std::string> _language;
 	int _default_still_length;
+	Ratio const * _default_scale;
 	Ratio const * _default_container;
 	DCPContentType const * _default_dcp_content_type;
 	dcp::XMLMetadata _dcp_metadata;