Require "non-standard" config checkbox to use MPEG2.

Carsten reports that some users were choosing it because it sounded
familiar.

1 files changed, 17 insertions, 0 deletions

diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index d3dc096e0..89d49e5ef 100644
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -1075,6 +1075,9 @@ private:
 		checkbox(_("Allow creation of DCPs with 96kHz audio"), _allow_96khz_audio);
 		checkbox(_("Allow mapping to all audio channels"), _use_all_audio_channels);
 		checkbox(_("Allow use of SMPTE Bv2.0"), _allow_smpte_bv20);
+#if !defined(DCPOMATIC_VARIANT_POST)
+		checkbox(_("Allow use of MPEG2 Interop"), _allow_mpeg2);
+#endif
 
 		{
 			add_label_to_sizer(table, _panel, _("ISDCF name part length"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
@@ -1093,6 +1096,9 @@ private:
 		_allow_96khz_audio->bind(&NonStandardPage::allow_96khz_audio_changed, this);
 		_use_all_audio_channels->bind(&NonStandardPage::use_all_channels_changed, this);
 		_allow_smpte_bv20->bind(&NonStandardPage::allow_smpte_bv20_changed, this);
+#if !defined(DCPOMATIC_VARIANT_POST)
+		_allow_mpeg2->bind(&NonStandardPage::allow_mpeg2_changed, this);
+#endif
 		_isdcf_name_part_length->SetRange(1, 256);
 		_isdcf_name_part_length->Bind(wxEVT_SPINCTRL, boost::bind(&NonStandardPage::isdcf_name_part_length_changed, this));
 	}
@@ -1108,6 +1114,9 @@ private:
 		checked_set(_allow_96khz_audio, config->allow_96khz_audio());
 		checked_set(_use_all_audio_channels, config->use_all_audio_channels());
 		checked_set(_allow_smpte_bv20, config->allow_smpte_bv20());
+#if !defined(DCPOMATIC_VARIANT_POST)
+		checked_set(_allow_mpeg2, config->allow_mpeg2());
+#endif
 		checked_set(_isdcf_name_part_length, config->isdcf_name_part_length());
 	}
 
@@ -1146,6 +1155,13 @@ private:
 		Config::instance()->set_allow_smpte_bv20(_allow_smpte_bv20->GetValue());
 	}
 
+#if !defined(DCPOMATIC_VARIANT_POST)
+	void allow_mpeg2_changed()
+	{
+		Config::instance()->set_allow_mpeg2(_allow_mpeg2->GetValue());
+	}
+#endif
+
 	void isdcf_name_part_length_changed()
 	{
 		Config::instance()->set_isdcf_name_part_length(_isdcf_name_part_length->GetValue());
@@ -1158,6 +1174,7 @@ private:
 	CheckBox* _allow_96khz_audio = nullptr;
 	CheckBox* _use_all_audio_channels = nullptr;
 	CheckBox* _allow_smpte_bv20 = nullptr;
+	CheckBox* _allow_mpeg2 = nullptr;
 	wxSpinCtrl* _isdcf_name_part_length = nullptr;
 };