Give Film a container; move crop into video content; other bits.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/lib/config.h b/src/lib/config.h
index 96aa4e449..c43a4f079 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -34,7 +34,7 @@ class ServerDescription;
 class Scaler;
 class Filter;
 class SoundProcessor;
-class Format;
+class Container;
 class DCPContentType;
 
 /** @class Config
@@ -114,8 +114,8 @@ public:
 		return _default_still_length;
 	}
 
-	Format const * default_format () const {
-		return _default_format;
+	Container const * default_container () const {
+		return _default_container;
 	}
 
 	DCPContentType const * default_dcp_content_type () const {
@@ -193,8 +193,8 @@ public:
 		_default_still_length = s;
 	}
 
-	void set_default_format (Format const * f) {
-		_default_format = f;
+	void set_default_container (Container const * f) {
+		_default_container = f;
 	}
 
 	void set_default_dcp_content_type (DCPContentType const * t) {
@@ -244,7 +244,7 @@ private:
 	DCIMetadata _default_dci_metadata;
 	boost::optional<std::string> _language;
 	int _default_still_length;
-	Format const * _default_format;
+	Container const * _default_container;
 	DCPContentType const * _default_dcp_content_type;
 	libdcp::XMLMetadata _dcp_metadata;