Merge master.

1 files changed, 4 insertions, 3 deletions

diff --git a/src/lib/config.h b/src/lib/config.h
index 9a1808682..99b3eb621 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -33,6 +33,7 @@
 #include <dcp/signer.h>
 #include "isdcf_metadata.h"
 #include "colour_conversion.h"
+#include "video_content.h"
 
 class ServerDescription;
 class Scaler;
@@ -134,7 +135,7 @@ public:
 		return _default_still_length;
 	}
 
-	Ratio const * default_scale () const {
+	VideoContentScale default_scale () const {
 		return _default_scale;
 	}
 
@@ -307,7 +308,7 @@ public:
 		changed ();
 	}
 
-	void set_default_scale (Ratio const * s) {
+	void set_default_scale (VideoContentScale s) {
 		_default_scale = s;
 		changed ();
 	}
@@ -468,7 +469,7 @@ private:
 	ISDCFMetadata _default_isdcf_metadata;
 	boost::optional<std::string> _language;
 	int _default_still_length;
-	Ratio const * _default_scale;
+	VideoContentScale _default_scale;
 	Ratio const * _default_container;
 	DCPContentType const * _default_dcp_content_type;
 	std::string _dcp_issuer;