X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffull_config_dialog.cc;h=663f4baeb48ab9844192124610d10e6a788468bd;hb=refs%2Fheads%2F2381-templates;hp=f3d6977abcbb24f264a74060ae27b14529103274;hpb=a40d665fa9795e6d8a47f9fa962ef1e64d754778;p=dcpomatic.git

diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index f3d6977ab..663f4baeb 100644
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -313,10 +313,6 @@ private:
 			table->Add (s, 1);
 		}
 
-		add_label_to_sizer (table, _panel, _("Default standard"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
-		_standard = new wxChoice (_panel, wxID_ANY);
-		table->Add (_standard);
-
 		_enable_audio_language = new CheckBox(_panel, _("Default audio language"));
 		table->Add(_enable_audio_language, 1, wxEXPAND | wxALIGN_CENTRE_VERTICAL);
 		_audio_language = new LanguageTagWidget(_panel, _("Default audio language to use for new DCPs"), Config::instance()->default_audio_language(), wxString("cmnr-Hant-"));
@@ -380,10 +376,6 @@ private:
 		_audio_delay->SetRange (-1000, 1000);
 		_audio_delay->Bind (wxEVT_SPINCTRL, boost::bind (&DefaultsPage::audio_delay_changed, this));
 
-		_standard->Append (_("SMPTE"));
-		_standard->Append (_("Interop"));
-		_standard->Bind (wxEVT_CHOICE, boost::bind (&DefaultsPage::standard_changed, this));
-
 		for (auto const& i: _enable_metadata) {
 			i.second->bind(&DefaultsPage::metadata_changed, this);
 		}
@@ -409,7 +401,6 @@ private:
 		_kdm_type->set (config->default_kdm_type());
 		checked_set (_use_isdcf_name_by_default, config->use_isdcf_name_by_default());
 		checked_set (_audio_delay, config->default_audio_delay ());
-		checked_set (_standard, config->default_interop() ? 1 : 0);
 		auto dal = config->default_audio_language();
 		checked_set(_enable_audio_language, static_cast<bool>(dal));
 		checked_set(_audio_language, dal ? dal : boost::none);
@@ -511,11 +502,6 @@ private:
 		Config::instance()->set_default_still_length (_still_length->GetValue ());
 	}
 
-	void standard_changed ()
-	{
-		Config::instance()->set_default_interop (_standard->GetSelection() == 1);
-	}
-
 	void metadata_changed ()
 	{
 		map<string, string> metadata;
@@ -580,7 +566,6 @@ private:
 	wxSpinCtrl* _kdm_duration;
 	wxChoice* _kdm_duration_unit;
 	CheckBox* _use_isdcf_name_by_default;
-	wxChoice* _standard;
 	CheckBox* _enable_audio_language;
 	LanguageTagWidget* _audio_language;
 	CheckBox* _enable_territory;