Remove default Interop/SMPTE setting.

7 files changed, 2 insertions, 39 deletions

diff --git a/src/lib/config.cc b/src/lib/config.cc
index a446b37ca..2b435aa7b 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -789,8 +789,6 @@ Config::write_config () const
 	cxml::add_text_child(root, "DefaultStillLength", raw_convert<string>(_default_still_length));
 	/* [XML] DefaultAudioDelay Default delay to apply to audio (positive moves audio later) in milliseconds. */
 	cxml::add_text_child(root, "DefaultAudioDelay", raw_convert<string>(_default_audio_delay));
-	/* [XML] DefaultInterop 1 to default new films to Interop, 0 for SMPTE. */
-	cxml::add_text_child(root, "DefaultInterop", _default_interop ? "1" : "0");
 	if (_default_audio_language) {
 		/* [XML] DefaultAudioLanguage Default audio language to use for new films */
 		cxml::add_text_child(root, "DefaultAudioLanguage", _default_audio_language->to_string());
diff --git a/src/lib/config.h b/src/lib/config.h
index 4fccf2d5c..4635f8508 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -798,10 +798,6 @@ public:
 		maybe_set (_default_audio_delay, d);
 	}
 
-	void set_default_interop (bool i) {
-		maybe_set (_default_interop, i);
-	}
-
 	void set_default_audio_language(dcp::LanguageTag tag) {
 		maybe_set(_default_audio_language, tag);
 	}
diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index 856f70113..060549ba8 100644
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -319,10 +319,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-"));
@@ -386,10 +382,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);
 		}
@@ -414,7 +406,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);
@@ -516,11 +507,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;
@@ -585,7 +571,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;
diff --git a/test/client_server_test.cc b/test/client_server_test.cc
index 9840a07a1..43084bf31 100644
--- a/test/client_server_test.cc
+++ b/test/client_server_test.cc
@@ -33,6 +33,7 @@
 #include "lib/encode_server_description.h"
 #include "lib/encode_server_finder.h"
 #include "lib/file_log.h"
+#include "lib/film.h"
 #include "lib/image.h"
 #include "lib/j2k_image_proxy.h"
 #include "lib/player_video.h"
@@ -322,6 +323,7 @@ BOOST_AUTO_TEST_CASE(real_encode_with_server)
 
 	auto content = content_factory(TestPaths::private_data() / "dolby_aurora.vob");
 	auto film = new_test_film("real_encode_with_server", content, &cl);
+	film->set_interop(false);
 
 	EncodeServerFinder::instance();
 
diff --git a/test/create_cli_test.cc b/test/create_cli_test.cc
index 8ce19d5a2..7006fa6a0 100644
--- a/test/create_cli_test.cc
+++ b/test/create_cli_test.cc
@@ -286,20 +286,3 @@ BOOST_AUTO_TEST_CASE(create_cli_template_test)
 	film = cc.make_film();
 	BOOST_CHECK(film->interop());
 }
-
-
-BOOST_AUTO_TEST_CASE(create_cli_defaults_test)
-{
-	ConfigRestorer cr;
-
-	/* I think on balance dcpomatic2_create should not use the defaults from Config;
-	 * it seems a bit surprising that settings from a GUI tool can change the behaviour of
-	 * a CLI tool, and at some point we're probably going to remove all the default config
-	 * options from the main DoM anyway (in favour of a default template).
-	 */
-	Config::instance()->set_default_interop(true);
-	auto cc = run("dcpomatic2_create test/data/flat_red.png");
-	auto film = cc.make_film();
-	BOOST_CHECK(!film->interop());
-}
-
diff --git a/test/data b/test/data
-Subproject 04dde6faddc797652ead4f75d27dfdd48db77dd
+Subproject f647e9364406f7934acd4c248c77287a810f59c
diff --git a/test/test.cc b/test/test.cc
index 8efbf3225..abadb72fc 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -121,7 +121,6 @@ setup_test_config ()
 	Config::instance()->set_server_encoding_threads (1);
 	Config::instance()->set_server_port_base (61921);
 	Config::instance()->set_default_audio_delay (0);
-	Config::instance()->set_default_interop (false);
 	Config::instance()->set_default_still_length (10);
 	Config::instance()->set_log_types (
 		LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING |