Remove default DCP content type setting (already taken from template).

3 files changed, 1 insertions, 18 deletions

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 042dc9994..923116f3a 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -105,7 +105,6 @@ Config::set_defaults ()
 	_show_experimental_audio_processors = false;
 	_language = optional<string> ();
 	_default_still_length = 10;
-	_default_dcp_content_type = DCPContentType::from_isdcf_name ("FTR");
 	_default_dcp_audio_channels = 8;
 	_default_j2k_bandwidth = 150000000;
 	_default_audio_delay = 0;
@@ -339,7 +338,6 @@ try
 
 	_language = f.optional_string_child ("Language");
 
-	_default_dcp_content_type = DCPContentType::from_isdcf_name(f.optional_string_child("DefaultDCPContentType").get_value_or("FTR"));
 	_default_dcp_audio_channels = f.optional_number_child<int>("DefaultDCPAudioChannels").get_value_or (6);
 
 	if (f.optional_string_child ("DCPMetadataIssuer")) {
@@ -757,12 +755,6 @@ Config::write_config () const
 		/* [XML:opt] Language Language to use in the GUI e.g. <code>fr_FR</code>. */
 		root->add_child("Language")->add_child_text (_language.get());
 	}
-	if (_default_dcp_content_type) {
-		/* [XML:opt] DefaultDCPContentType Default content type to use when creating new films (<code>FTR</code>, <code>SHR</code>,
-		   <code>TLR</code>, <code>TST</code>, <code>XSN</code>, <code>RTG</code>, <code>TSR</code>, <code>POL</code>,
-		   <code>PSA</code> or <code>ADV</code>). */
-		root->add_child("DefaultDCPContentType")->add_child_text (_default_dcp_content_type->isdcf_name ());
-	}
 	/* [XML] DefaultDCPAudioChannels Default number of audio channels to use when creating new films. */
 	root->add_child("DefaultDCPAudioChannels")->add_child_text (raw_convert<string> (_default_dcp_audio_channels));
 	/* [XML] DCPIssuer Issuer text to write into CPL files. */
diff --git a/src/lib/config.h b/src/lib/config.h
index 94f616812..57de737e3 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -195,10 +195,6 @@ public:
 		return _default_still_length;
 	}
 
-	DCPContentType const * default_dcp_content_type () const {
-		return _default_dcp_content_type;
-	}
-
 	int default_dcp_audio_channels () const {
 		return _default_dcp_audio_channels;
 	}
@@ -742,10 +738,6 @@ public:
 		maybe_set (_default_still_length, s);
 	}
 
-	void set_default_dcp_content_type (DCPContentType const * t) {
-		maybe_set (_default_dcp_content_type, t);
-	}
-
 	void set_default_dcp_audio_channels (int c) {
 		maybe_set (_default_dcp_audio_channels, c);
 	}
@@ -1330,7 +1322,6 @@ private:
 	boost::optional<std::string> _language;
  	/** Default length of still image content (seconds) */
 	int _default_still_length;
-	DCPContentType const * _default_dcp_content_type;
 	int _default_dcp_audio_channels;
 	std::string _dcp_issuer;
 	std::string _dcp_creator;
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 02fcfe923..f807619f3 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -155,7 +155,7 @@ int const Film::current_state_version = 38;
 Film::Film (optional<boost::filesystem::path> dir)
 	: _playlist (new Playlist)
 	, _use_isdcf_name (Config::instance()->use_isdcf_name_by_default())
-	, _dcp_content_type (Config::instance()->default_dcp_content_type ())
+	, _dcp_content_type(DCPContentType::from_isdcf_name("FTR"))
 	, _container(Ratio::from_id("185"))
 	, _resolution (Resolution::TWO_K)
 	, _encrypted (false)