Remove default container configuration option.

I think this is basically useless now that DoM guesses a good container
when the first video is added.  It made more sense before we did that.

4 files changed, 1 insertions, 52 deletions

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 6984c4064..235bace7b 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -106,7 +106,6 @@ Config::set_defaults ()
 	_show_experimental_audio_processors = false;
 	_language = optional<string> ();
 	_default_still_length = 10;
-	_default_container = Ratio::from_id ("185");
 	_default_dcp_content_type = DCPContentType::from_isdcf_name ("FTR");
 	_default_dcp_audio_channels = 6;
 	_default_j2k_bandwidth = 150000000;
@@ -334,16 +333,6 @@ try
 
 	_language = f.optional_string_child ("Language");
 
-	auto c = f.optional_string_child ("DefaultContainer");
-	if (c) {
-		_default_container = Ratio::from_id (c.get ());
-	}
-
-	if (_default_container && !_default_container->used_for_container()) {
-		Warning (_("Your default container is not valid and has been changed to Flat (1.85:1)"));
-		_default_container = Ratio::from_id ("185");
-	}
-
 	_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);
 
@@ -735,13 +724,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_container) {
-		/* [XML:opt] DefaultContainer ID of default container
-		   to use when creating new films (<code>185</code>,<code>239</code> or
-		   <code>190</code>).
-		*/
-		root->add_child("DefaultContainer")->add_child_text (_default_container->id ());
-	}
 	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>,
diff --git a/src/lib/config.h b/src/lib/config.h
index 9e84a120b..c86622427 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -194,10 +194,6 @@ public:
 		return _default_still_length;
 	}
 
-	Ratio const * default_container () const {
-		return _default_container;
-	}
-
 	DCPContentType const * default_dcp_content_type () const {
 		return _default_dcp_content_type;
 	}
@@ -722,10 +718,6 @@ public:
 		maybe_set (_default_still_length, s);
 	}
 
-	void set_default_container (Ratio const * c) {
-		maybe_set (_default_container, c);
-	}
-
 	void set_default_dcp_content_type (DCPContentType const * t) {
 		maybe_set (_default_dcp_content_type, t);
 	}
@@ -1289,7 +1281,6 @@ private:
 	boost::optional<std::string> _language;
  	/** Default length of still image content (seconds) */
 	int _default_still_length;
-	Ratio const * _default_container;
 	DCPContentType const * _default_dcp_content_type;
 	int _default_dcp_audio_channels;
 	std::string _dcp_issuer;
diff --git a/src/lib/film.cc b/src/lib/film.cc
index d5597b5a1..7d713c041 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -156,7 +156,7 @@ 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 ())
-	, _container (Config::instance()->default_container ())
+	, _container(Ratio::from_id("185"))
 	, _resolution (Resolution::TWO_K)
 	, _encrypted (false)
 	, _context_id (dcp::make_uuid ())
diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index c688109c9..ba596162e 100644
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -285,10 +285,6 @@ private:
 #endif
 		table->Add (_directory, 1, wxEXPAND);
 
-		add_label_to_sizer (table, _panel, _("Default container"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
-		_container = new wxChoice (_panel, wxID_ANY);
-		table->Add (_container);
-
 		add_label_to_sizer (table, _panel, _("Default content type"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 		_dcp_content_type = new wxChoice (_panel, wxID_ANY);
 		table->Add (_dcp_content_type);
@@ -369,12 +365,6 @@ private:
 
 		_use_isdcf_name_by_default->bind(&DefaultsPage::use_isdcf_name_by_default_changed, this);
 
-		for (auto i: Ratio::containers()) {
-			_container->Append (std_to_wx(i->container_nickname()));
-		}
-
-		_container->Bind (wxEVT_CHOICE, boost::bind (&DefaultsPage::container_changed, this));
-
 		for (auto i: DCPContentType::all()) {
 			_dcp_content_type->Append (std_to_wx (i->pretty_name ()));
 		}
@@ -407,13 +397,6 @@ private:
 	{
 		auto config = Config::instance ();
 
-		auto containers = Ratio::containers ();
-		for (size_t i = 0; i < containers.size(); ++i) {
-			if (containers[i] == config->default_container()) {
-				_container->SetSelection (i);
-			}
-		}
-
 		auto const ct = DCPContentType::all ();
 		for (size_t i = 0; i < ct.size(); ++i) {
 			if (ct[i] == config->default_dcp_content_type()) {
@@ -541,12 +524,6 @@ private:
 		Config::instance()->set_default_still_length (_still_length->GetValue ());
 	}
 
-	void container_changed ()
-	{
-		auto ratio = Ratio::containers ();
-		Config::instance()->set_default_container (ratio[_container->GetSelection()]);
-	}
-
 	void dcp_content_type_changed ()
 	{
 		auto ct = DCPContentType::all ();
@@ -591,7 +568,6 @@ private:
 	wxSpinCtrl* _kdm_duration;
 	wxChoice* _kdm_duration_unit;
 	CheckBox* _use_isdcf_name_by_default;
-	wxChoice* _container;
 	wxChoice* _dcp_content_type;
 	wxChoice* _dcp_audio_channels;
 	wxChoice* _standard;