Remove default DCP audio channel setting.

3 files changed, 0 insertions, 26 deletions

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 58c4afe10..5401839e3 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -770,8 +770,6 @@ Config::write_config () const
 		/* [XML:opt] Language Language to use in the GUI e.g. <code>fr_FR</code>. */
 		cxml::add_text_child(root, "Language", _language.get());
 	}
-	/* [XML] DefaultDCPAudioChannels Default number of audio channels to use when creating new films. */
-	cxml::add_text_child(root, "DefaultDCPAudioChannels", raw_convert<string>(_default_dcp_audio_channels));
 	/* [XML] DCPIssuer Issuer text to write into CPL files. */
 	cxml::add_text_child(root, "DCPIssuer", _dcp_issuer);
 	/* [XML] DCPCreator Creator text to write into CPL files. */
diff --git a/src/lib/config.h b/src/lib/config.h
index ab44e414a..aaeada4e6 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -770,10 +770,6 @@ public:
 		maybe_set (_default_still_length, s);
 	}
 
-	void set_default_dcp_audio_channels (int c) {
-		maybe_set (_default_dcp_audio_channels, c);
-	}
-
 	void set_dcp_issuer (std::string i) {
 		maybe_set (_dcp_issuer, i);
 	}
diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index 6d54cc6ba..67813ba0b 100644
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -310,10 +310,6 @@ private:
 #endif
 		table->Add (_directory, 1, wxEXPAND);
 
-		add_label_to_sizer (table, _panel, _("Default DCP audio channels"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
-		_dcp_audio_channels = new wxChoice (_panel, wxID_ANY);
-		table->Add (_dcp_audio_channels);
-
 		{
 			add_label_to_sizer(table, _panel, _("Default JPEG2000 bit rate"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 			auto s = new wxBoxSizer (wxHORIZONTAL);
@@ -405,10 +401,6 @@ private:
 
 		_use_isdcf_name_by_default->bind(&DefaultsPage::use_isdcf_name_by_default_changed, this);
 
-		setup_audio_channels_choice (_dcp_audio_channels, 2);
-
-		_dcp_audio_channels->Bind (wxEVT_CHOICE, boost::bind (&DefaultsPage::dcp_audio_channels_changed, this));
-
 		_j2k_video_bit_rate->SetRange(50, 250);
 		_j2k_video_bit_rate->Bind(wxEVT_SPINCTRL, boost::bind(&DefaultsPage::j2k_video_bit_rate_changed, this));
 		_mpeg2_video_bit_rate->SetRange(1, 50);
@@ -448,7 +440,6 @@ private:
 		_j2k_video_bit_rate->SetRange(50, config->maximum_video_bit_rate(VideoEncoding::JPEG2000) / 1000000);
 		checked_set(_mpeg2_video_bit_rate, config->default_video_bit_rate(VideoEncoding::MPEG2) / 1000000);
 		_mpeg2_video_bit_rate->SetRange(1, config->maximum_video_bit_rate(VideoEncoding::MPEG2) / 1000000);
-		checked_set (_dcp_audio_channels, locale_convert<string> (config->default_dcp_audio_channels()));
 		checked_set (_audio_delay, config->default_audio_delay ());
 		checked_set (_standard, config->default_interop() ? 1 : 0);
 		auto dal = config->default_audio_language();
@@ -537,16 +528,6 @@ private:
 		Config::instance()->set_default_audio_delay (_audio_delay->GetValue());
 	}
 
-	void dcp_audio_channels_changed ()
-	{
-		int const s = _dcp_audio_channels->GetSelection ();
-		if (s != wxNOT_FOUND) {
-			Config::instance()->set_default_dcp_audio_channels (
-				locale_convert<int>(string_client_data(_dcp_audio_channels->GetClientObject(s)))
-				);
-		}
-	}
-
 	void directory_changed ()
 	{
 		Config::instance()->set_default_directory (wx_to_std (_directory->GetPath ()));
@@ -643,7 +624,6 @@ private:
 	wxSpinCtrl* _kdm_duration;
 	wxChoice* _kdm_duration_unit;
 	CheckBox* _use_isdcf_name_by_default;
-	wxChoice* _dcp_audio_channels;
 	wxChoice* _standard;
 	CheckBox* _enable_audio_language;
 	LanguageTagWidget* _audio_language;