X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffull_config_dialog.cc;h=c688109c9a8ee640129897293700e94c56759b92;hb=60a864b0b9985f9e84db7028d5b9a523ecfde522;hp=e39a10f09632516a15952bd0653954b6fee07adc;hpb=08b44e380c8be3a8cb2dacbd94049f09942dabc1;p=dcpomatic.git

diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index e39a10f09..c688109c9 100644
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -118,7 +118,7 @@ private:
 		add_label_to_sizer (table, _panel, _("Cinema and screen database file"), true, wxGBPosition (r, 0));
 		_cinemas_file = new FilePickerCtrl (_panel, _("Select cinema and screen database file"), "*.xml", true, false);
 		table->Add (_cinemas_file, wxGBPosition (r, 1));
-		Button* export_cinemas = new Button (_panel, _("Export..."));
+		auto export_cinemas = new Button (_panel, _("Export..."));
 		table->Add (export_cinemas, wxGBPosition (r, 2));
 		++r;
 
@@ -144,9 +144,9 @@ private:
 		export_cinemas->Bind (wxEVT_BUTTON, boost::bind (&FullGeneralPage::export_cinemas_file, this));
 
 #ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
-		_analyse_ebur128->Bind (wxEVT_CHECKBOX, boost::bind (&FullGeneralPage::analyse_ebur128_changed, this));
+		_analyse_ebur128->bind(&FullGeneralPage::analyse_ebur128_changed, this);
 #endif
-		_automatic_audio_analysis->Bind (wxEVT_CHECKBOX, boost::bind (&FullGeneralPage::automatic_audio_analysis_changed, this));
+		_automatic_audio_analysis->bind(&FullGeneralPage::automatic_audio_analysis_changed, this);
 	}
 
 	void config_changed () override
@@ -173,7 +173,7 @@ private:
                 );
 
 		if (d->ShowModal () == wxID_OK) {
-			boost::filesystem::copy_file (Config::instance()->cinemas_file(), wx_to_std(d->GetPath()));
+			boost::filesystem::copy_file(Config::instance()->cinemas_file(), wx_to_std(d->GetPath()), boost::filesystem::copy_option::overwrite_if_exists);
 		}
 		d->Destroy ();
 	}
@@ -236,9 +236,9 @@ private:
 	FilePickerCtrl* _config_file;
 	FilePickerCtrl* _cinemas_file;
 #ifdef DCPOMATIC_HAVE_EBUR128_PATCHED_FFMPEG
-	wxCheckBox* _analyse_ebur128;
+	CheckBox* _analyse_ebur128;
 #endif
-	wxCheckBox* _automatic_audio_analysis;
+	CheckBox* _automatic_audio_analysis;
 };
 
 
@@ -257,7 +257,7 @@ public:
 #ifdef DCPOMATIC_OSX
 	wxBitmap GetLargeIcon () const override
 	{
-		return wxBitmap(bitmap_path("defaults"), wxBITMAP_TYPE_PNG);
+		return wxBitmap(icon_path("defaults"), wxBITMAP_TYPE_PNG);
 	}
 #endif
 
@@ -343,6 +343,14 @@ private:
 		_kdm_type = new KDMChoice (_panel);
 		table->Add (_kdm_type, 1, wxEXPAND);
 
+		add_label_to_sizer (table, _panel, _("Default KDM duration"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
+		_kdm_duration = new wxSpinCtrl (_panel);
+		_kdm_duration_unit = new wxChoice (_panel, wxID_ANY);
+		auto kdm_duration_sizer = new wxBoxSizer (wxHORIZONTAL);
+		kdm_duration_sizer->Add (_kdm_duration, 0, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP);
+		kdm_duration_sizer->Add (_kdm_duration_unit, 0, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP);
+		table->Add (kdm_duration_sizer, 1, wxEXPAND);
+
 		table->Add (_use_isdcf_name_by_default = new CheckBox(_panel, _("Use ISDCF name by default")), 0, wxALIGN_CENTRE_VERTICAL);
 
 		_still_length->SetRange (1, 3600);
@@ -351,8 +359,15 @@ private:
 		_directory->Bind (wxEVT_DIRPICKER_CHANGED, boost::bind (&DefaultsPage::directory_changed, this));
 		_kdm_directory->Bind (wxEVT_DIRPICKER_CHANGED, boost::bind (&DefaultsPage::kdm_directory_changed, this));
 		_kdm_type->Bind (wxEVT_CHOICE, boost::bind(&DefaultsPage::kdm_type_changed, this));
+		_kdm_duration_unit->Append (_("days"));
+		_kdm_duration_unit->Append (_("weeks"));
+		_kdm_duration_unit->Append (_("months"));
+		_kdm_duration_unit->Append (_("years"));
+
+		_kdm_duration->Bind (wxEVT_SPINCTRL, boost::bind(&DefaultsPage::kdm_duration_changed, this));
+		_kdm_duration_unit->Bind (wxEVT_CHOICE, boost::bind(&DefaultsPage::kdm_duration_changed, this));
 
-		_use_isdcf_name_by_default->Bind (wxEVT_CHECKBOX, boost::bind(&DefaultsPage::use_isdcf_name_by_default_changed, this));
+		_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()));
@@ -380,7 +395,7 @@ private:
 		_standard->Bind (wxEVT_CHOICE, boost::bind (&DefaultsPage::standard_changed, this));
 
 		for (auto const& i: _enable_metadata) {
-			i.second->Bind (wxEVT_CHECKBOX, boost::bind(&DefaultsPage::metadata_changed, this));
+			i.second->bind(&DefaultsPage::metadata_changed, this);
 		}
 
 		for (auto const& i: _metadata) {
@@ -436,9 +451,51 @@ private:
 			}
 		}
 
+		checked_set (_kdm_duration, config->default_kdm_duration().duration);
+		switch (config->default_kdm_duration().unit) {
+			case RoughDuration::Unit::DAYS:
+				_kdm_duration->SetRange(1, 365);
+				checked_set (_kdm_duration_unit, 0);
+				break;
+			case RoughDuration::Unit::WEEKS:
+				_kdm_duration->SetRange(1, 52);
+				checked_set (_kdm_duration_unit, 1);
+				break;
+			case RoughDuration::Unit::MONTHS:
+				_kdm_duration->SetRange(1, 12);
+				checked_set (_kdm_duration_unit, 2);
+				break;
+			case RoughDuration::Unit::YEARS:
+				_kdm_duration->SetRange(1, 40);
+				checked_set (_kdm_duration_unit, 3);
+				break;
+		}
+
 		setup_sensitivity ();
 	}
 
+	void kdm_duration_changed ()
+	{
+		auto config = Config::instance();
+		auto duration = _kdm_duration->GetValue();
+		RoughDuration::Unit unit = RoughDuration::Unit::DAYS;
+		switch (_kdm_duration_unit->GetSelection()) {
+		case 0:
+			unit = RoughDuration::Unit::DAYS;
+			break;
+		case 1:
+			unit = RoughDuration::Unit::WEEKS;
+			break;
+		case 2:
+			unit = RoughDuration::Unit::MONTHS;
+			break;
+		case 3:
+			unit = RoughDuration::Unit::YEARS;
+			break;
+		}
+		config->set_default_kdm_duration (RoughDuration(duration, unit));
+	}
+
 	void j2k_bandwidth_changed ()
 	{
 		Config::instance()->set_default_j2k_bandwidth (_j2k_bandwidth->GetValue() * 1000000);
@@ -531,7 +588,9 @@ private:
 	wxDirPickerCtrl* _kdm_directory;
 #endif
 	KDMChoice* _kdm_type;
-	wxCheckBox* _use_isdcf_name_by_default;
+	wxSpinCtrl* _kdm_duration;
+	wxChoice* _kdm_duration_unit;
+	CheckBox* _use_isdcf_name_by_default;
 	wxChoice* _container;
 	wxChoice* _dcp_content_type;
 	wxChoice* _dcp_audio_channels;
@@ -556,7 +615,7 @@ public:
 #ifdef DCPOMATIC_OSX
 	wxBitmap GetLargeIcon () const override
 	{
-		return wxBitmap(bitmap_path("servers"), wxBITMAP_TYPE_PNG);
+		return wxBitmap(icon_path("servers"), wxBITMAP_TYPE_PNG);
 	}
 #endif
 
@@ -573,12 +632,14 @@ private:
 			columns,
 			boost::bind (&Config::servers, Config::instance()),
 			boost::bind (&Config::set_servers, Config::instance(), _1),
-			boost::bind (&EncodingServersPage::server_column, this, _1)
+			boost::bind (&EncodingServersPage::server_column, this, _1),
+			EditableListTitle::INVISIBLE,
+			EditableListButton::NEW | EditableListButton::EDIT | EditableListButton::REMOVE
 			);
 
 		_panel->GetSizer()->Add (_servers_list, 1, wxEXPAND | wxALL, _border);
 
-		_use_any_servers->Bind (wxEVT_CHECKBOX, boost::bind(&EncodingServersPage::use_any_servers_changed, this));
+		_use_any_servers->bind(&EncodingServersPage::use_any_servers_changed, this);
 	}
 
 	void config_changed () override
@@ -597,7 +658,7 @@ private:
 		return s;
 	}
 
-	wxCheckBox* _use_any_servers;
+	CheckBox* _use_any_servers;
 	EditableList<string, ServerDialog>* _servers_list;
 };
 
@@ -617,7 +678,7 @@ public:
 #ifdef DCPOMATIC_OSX
 	wxBitmap GetLargeIcon () const override
 	{
-		return wxBitmap(bitmap_path("tms"), wxBITMAP_TYPE_PNG);
+		return wxBitmap(icon_path("tms"), wxBITMAP_TYPE_PNG);
 	}
 #endif
 
@@ -635,6 +696,10 @@ private:
 		_tms_protocol = new wxChoice (_panel, wxID_ANY);
 		table->Add (_tms_protocol, 1, wxEXPAND);
 
+		_tms_passive = new CheckBox(_panel, _("Passive mode"));
+		table->Add(_tms_passive, 1, wxEXPAND);
+		table->AddSpacer(0);
+
 		add_label_to_sizer (table, _panel, _("IP address"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
 		_tms_ip = new wxTextCtrl (_panel, wxID_ANY);
 		table->Add (_tms_ip, 1, wxEXPAND);
@@ -654,8 +719,10 @@ private:
 		_tms_protocol->Append (_("SCP (for AAM and Doremi)"));
 		_tms_protocol->Append (_("FTP (for Dolby)"));
 
-		_upload->Bind (wxEVT_CHECKBOX, boost::bind(&TMSPage::upload_changed, this));
+		_upload->bind(&TMSPage::upload_changed, this);
 		_tms_protocol->Bind (wxEVT_CHOICE, boost::bind (&TMSPage::tms_protocol_changed, this));
+		_tms_passive->bind(&TMSPage::tms_passive_changed, this);
+
 		_tms_ip->Bind (wxEVT_TEXT, boost::bind (&TMSPage::tms_ip_changed, this));
 		_tms_path->Bind (wxEVT_TEXT, boost::bind (&TMSPage::tms_path_changed, this));
 		_tms_user->Bind (wxEVT_TEXT, boost::bind (&TMSPage::tms_user_changed, this));
@@ -668,10 +735,13 @@ private:
 
 		checked_set (_upload, config->upload_after_make_dcp());
 		checked_set (_tms_protocol, static_cast<int>(config->tms_protocol()));
+		checked_set(_tms_passive, config->tms_protocol() == FileTransferProtocol::FTP && config->tms_passive());
 		checked_set (_tms_ip, config->tms_ip ());
 		checked_set (_tms_path, config->tms_path ());
 		checked_set (_tms_user, config->tms_user ());
 		checked_set (_tms_password, config->tms_password ());
+
+		_tms_passive->Enable(config->tms_protocol() == FileTransferProtocol::FTP);
 	}
 
 	void upload_changed ()
@@ -684,6 +754,11 @@ private:
 		Config::instance()->set_tms_protocol(static_cast<FileTransferProtocol>(_tms_protocol->GetSelection()));
 	}
 
+	void tms_passive_changed()
+	{
+		Config::instance()->set_tms_passive(_tms_passive->get());
+	}
+
 	void tms_ip_changed ()
 	{
 		Config::instance()->set_tms_ip (wx_to_std (_tms_ip->GetValue ()));
@@ -705,6 +780,7 @@ private:
 	}
 
 	CheckBox* _upload;
+	CheckBox* _tms_passive;
 	wxChoice* _tms_protocol;
 	wxTextCtrl* _tms_ip;
 	wxTextCtrl* _tms_path;
@@ -728,7 +804,7 @@ public:
 #ifdef DCPOMATIC_OSX
 	wxBitmap GetLargeIcon () const override
 	{
-		return wxBitmap(bitmap_path("email"), wxBITMAP_TYPE_PNG);
+		return wxBitmap(icon_path("email"), wxBITMAP_TYPE_PNG);
 	}
 #endif
 
@@ -900,7 +976,7 @@ public:
 #ifdef DCPOMATIC_OSX
 	wxBitmap GetLargeIcon () const override
 	{
-		return wxBitmap(bitmap_path("kdm_email"), wxBITMAP_TYPE_PNG);
+		return wxBitmap(icon_path("kdm_email"), wxBITMAP_TYPE_PNG);
 	}
 #endif
 
@@ -929,7 +1005,10 @@ private:
 			bind (&Config::set_kdm_cc, Config::instance(), _1),
 			[] (string s, int) {
 				return s;
-			});
+			},
+			EditableListTitle::VISIBLE,
+			EditableListButton::NEW | EditableListButton::EDIT | EditableListButton::REMOVE
+			);
 		table->Add (_cc, 1, wxEXPAND | wxALL);
 
 		add_label_to_sizer (table, _panel, _("BCC address"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
@@ -1022,7 +1101,7 @@ public:
 #ifdef DCPOMATIC_OSX
 	wxBitmap GetLargeIcon () const override
 	{
-		return wxBitmap(bitmap_path("notifications"), wxBITMAP_TYPE_PNG);
+		return wxBitmap(icon_path("notifications"), wxBITMAP_TYPE_PNG);
 	}
 #endif
 
@@ -1063,7 +1142,10 @@ private:
 			bind (&Config::set_notification_cc, Config::instance(), _1),
 			[] (string s, int) {
 				return s;
-			});
+			},
+			EditableListTitle::VISIBLE,
+			EditableListButton::NEW | EditableListButton::EDIT | EditableListButton::REMOVE
+			);
 		table->Add (_cc, 1, wxEXPAND | wxALL);
 
 		add_label_to_sizer (table, _panel, _("BCC address"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
@@ -1078,8 +1160,8 @@ private:
 
 		_cc->layout ();
 
-		_enable_message_box->Bind (wxEVT_CHECKBOX, boost::bind (&NotificationsPage::type_changed, this, _enable_message_box, Config::MESSAGE_BOX));
-		_enable_email->Bind (wxEVT_CHECKBOX, boost::bind (&NotificationsPage::type_changed, this, _enable_email, Config::EMAIL));
+		_enable_message_box->bind(&NotificationsPage::type_changed, this, _enable_message_box, Config::MESSAGE_BOX);
+		_enable_email->bind(&NotificationsPage::type_changed, this, _enable_email, Config::EMAIL);
 
 		_subject->Bind (wxEVT_TEXT, boost::bind (&NotificationsPage::notification_subject_changed, this));
 		_from->Bind (wxEVT_TEXT, boost::bind (&NotificationsPage::notification_from_changed, this));
@@ -1155,14 +1237,14 @@ private:
 		checked_set (_email, Config::instance()->notification_email());
 	}
 
-	void type_changed (wxCheckBox* b, Config::Notification n)
+	void type_changed (CheckBox* b, Config::Notification n)
 	{
 		Config::instance()->set_notification(n, b->GetValue());
 		setup_sensitivity ();
 	}
 
-	wxCheckBox* _enable_message_box;
-	wxCheckBox* _enable_email;
+	CheckBox* _enable_message_box;
+	CheckBox* _enable_email;
 
 	wxTextCtrl* _subject;
 	wxTextCtrl* _from;
@@ -1195,7 +1277,7 @@ public:
 #ifdef DCPOMATIC_OSX
 	wxBitmap GetLargeIcon () const override
 	{
-		return wxBitmap(bitmap_path("cover_sheet"), wxBITMAP_TYPE_PNG);
+		return wxBitmap(icon_path("cover_sheet"), wxBITMAP_TYPE_PNG);
 	}
 #endif
 
@@ -1254,7 +1336,7 @@ public:
 #ifdef DCPOMATIC_OSX
 	wxBitmap GetLargeIcon () const override
 	{
-		return wxBitmap(bitmap_path("identifiers"), wxBITMAP_TYPE_PNG);
+		return wxBitmap(icon_path("identifiers"), wxBITMAP_TYPE_PNG);
 	}
 #endif
 
@@ -1372,7 +1454,7 @@ public:
 #ifdef DCPOMATIC_OSX
 	wxBitmap GetLargeIcon () const override
 	{
-		return wxBitmap(bitmap_path("advanced"), wxBITMAP_TYPE_PNG);
+		return wxBitmap(icon_path("advanced"), wxBITMAP_TYPE_PNG);
 	}
 #endif
 
@@ -1415,24 +1497,29 @@ private:
 		table->AddSpacer (0);
 
 		_allow_any_dcp_frame_rate = new CheckBox (_panel, _("Allow any DCP frame rate"));
-		table->Add (_allow_any_dcp_frame_rate, 1, wxEXPAND | wxALL);
+		table->Add (_allow_any_dcp_frame_rate, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_GAP);
 		table->AddSpacer (0);
 
 		_allow_any_container = new CheckBox (_panel, _("Allow full-frame and non-standard container ratios"));
-		table->Add (_allow_any_container, 1, wxEXPAND | wxALL);
-		restart = add_label_to_sizer (table, _panel, _("(restart DCP-o-matic to see all ratios)"), false);
+		table->Add (_allow_any_container, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_GAP);
+		restart = new StaticText (_panel, _("(restart DCP-o-matic to see all ratios)"));
+		table->Add (restart, 1, wxEXPAND | wxALL | wxALIGN_CENTRE_VERTICAL);
 		restart->SetFont (font);
 
 		_allow_96khz_audio = new CheckBox (_panel, _("Allow creation of DCPs with 96kHz audio"));
-		table->Add (_allow_96khz_audio, 1, wxEXPAND | wxALL);
+		table->Add (_allow_96khz_audio, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_GAP);
 		table->AddSpacer (0);
 
+		_use_all_audio_channels = new CheckBox(_panel, _("Allow mapping to all audio channels"));
+		table->Add(_use_all_audio_channels, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_GAP);
+		table->AddSpacer(0);
+
 		_show_experimental_audio_processors = new CheckBox (_panel, _("Show experimental audio processors"));
-		table->Add (_show_experimental_audio_processors, 1, wxEXPAND | wxALL);
+		table->Add (_show_experimental_audio_processors, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_GAP);
 		table->AddSpacer (0);
 
 		_only_servers_encode = new CheckBox (_panel, _("Only servers encode"));
-		table->Add (_only_servers_encode, 1, wxEXPAND | wxALL);
+		table->Add (_only_servers_encode, 1, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_GAP);
 		table->AddSpacer (0);
 
 		{
@@ -1450,7 +1537,7 @@ private:
 			align->Add (format, 0, wxTOP, 2);
 			table->Add (align, 0, wxALIGN_RIGHT | wxRIGHT, DCPOMATIC_SIZER_GAP - 2);
 #else
-			table->Add (format, 0, wxTOP | wxRIGHT | wxALIGN_TOP, DCPOMATIC_SIZER_GAP);
+			table->Add (format, 0, wxTOP | wxLEFT | wxRIGHT | wxALIGN_TOP, DCPOMATIC_SIZER_GAP);
 #endif
 			dcp::NameFormat::Map titles;
 			titles['t'] = wx_to_std (_("type (cpl/pkl)"));
@@ -1469,7 +1556,7 @@ private:
 			align->Add (format, 0, wxTOP, 2);
 			table->Add (align, 0, wxALIGN_RIGHT | wxRIGHT, DCPOMATIC_SIZER_GAP - 2);
 #else
-			table->Add (format, 0, wxTOP | wxRIGHT | wxALIGN_TOP, DCPOMATIC_SIZER_GAP);
+			table->Add (format, 0, wxTOP | wxLEFT | wxRIGHT | wxALIGN_TOP, DCPOMATIC_SIZER_GAP);
 #endif
 			dcp::NameFormat::Map titles;
 			titles['t'] = wx_to_std (_("type (j2c/pcm/sub)"));
@@ -1527,26 +1614,27 @@ private:
 		_video_display_mode->Append (_("OpenGL (faster)"));
 #endif
 		_video_display_mode->Bind (wxEVT_CHOICE, boost::bind(&AdvancedPage::video_display_mode_changed, this));
-		_allow_any_dcp_frame_rate->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::allow_any_dcp_frame_rate_changed, this));
-		_allow_any_container->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::allow_any_container_changed, this));
-		_allow_96khz_audio->Bind (wxEVT_CHECKBOX, boost::bind(&AdvancedPage::allow_96khz_audio_changed, this));
-		_show_experimental_audio_processors->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::show_experimental_audio_processors_changed, this));
-		_only_servers_encode->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::only_servers_encode_changed, this));
+		_allow_any_dcp_frame_rate->bind(&AdvancedPage::allow_any_dcp_frame_rate_changed, this);
+		_allow_any_container->bind(&AdvancedPage::allow_any_container_changed, this);
+		_allow_96khz_audio->bind(&AdvancedPage::allow_96khz_audio_changed, this);
+		_use_all_audio_channels->bind(&AdvancedPage::use_all_channels_changed, this);
+		_show_experimental_audio_processors->bind(&AdvancedPage::show_experimental_audio_processors_changed, this);
+		_only_servers_encode->bind(&AdvancedPage::only_servers_encode_changed, this);
 		_frames_in_memory_multiplier->Bind (wxEVT_SPINCTRL, boost::bind(&AdvancedPage::frames_in_memory_multiplier_changed, this));
 		_dcp_metadata_filename_format->Changed.connect (boost::bind (&AdvancedPage::dcp_metadata_filename_format_changed, this));
 		_dcp_asset_filename_format->Changed.connect (boost::bind (&AdvancedPage::dcp_asset_filename_format_changed, this));
-		_log_general->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
-		_log_warning->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
-		_log_error->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
-		_log_timing->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
-		_log_debug_threed->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
-		_log_debug_encode->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
-		_log_debug_email->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
-		_log_debug_video_view->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
-		_log_debug_player->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
-		_log_debug_audio_analysis->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::log_changed, this));
+		_log_general->bind(&AdvancedPage::log_changed, this);
+		_log_warning->bind(&AdvancedPage::log_changed, this);
+		_log_error->bind(&AdvancedPage::log_changed, this);
+		_log_timing->bind(&AdvancedPage::log_changed, this);
+		_log_debug_threed->bind(&AdvancedPage::log_changed, this);
+		_log_debug_encode->bind(&AdvancedPage::log_changed, this);
+		_log_debug_email->bind(&AdvancedPage::log_changed, this);
+		_log_debug_video_view->bind(&AdvancedPage::log_changed, this);
+		_log_debug_player->bind(&AdvancedPage::log_changed, this);
+		_log_debug_audio_analysis->bind(&AdvancedPage::log_changed, this);
 #ifdef DCPOMATIC_WINDOWS
-		_win32_console->Bind (wxEVT_CHECKBOX, boost::bind (&AdvancedPage::win32_console_changed, this));
+		_win32_console->bind(&AdvancedPage::win32_console_changed, this);
 #endif
 	}
 
@@ -1566,6 +1654,7 @@ private:
 		checked_set (_allow_any_dcp_frame_rate, config->allow_any_dcp_frame_rate ());
 		checked_set (_allow_any_container, config->allow_any_container ());
 		checked_set (_allow_96khz_audio, config->allow_96khz_audio());
+		checked_set (_use_all_audio_channels, config->use_all_audio_channels());
 		checked_set (_show_experimental_audio_processors, config->show_experimental_audio_processors ());
 		checked_set (_only_servers_encode, config->only_servers_encode ());
 		checked_set (_log_general, config->log_types() & LogEntry::TYPE_GENERAL);
@@ -1618,6 +1707,11 @@ private:
 		Config::instance()->set_allow_96hhz_audio(_allow_96khz_audio->GetValue());
 	}
 
+	void use_all_channels_changed ()
+	{
+		Config::instance()->set_use_all_audio_channels(_use_all_audio_channels->GetValue());
+	}
+
 	void show_experimental_audio_processors_changed ()
 	{
 		Config::instance()->set_show_experimental_audio_processors(_show_experimental_audio_processors->GetValue());
@@ -1684,25 +1778,26 @@ private:
 	wxSpinCtrl* _maximum_j2k_bandwidth = nullptr;
 	wxChoice* _video_display_mode = nullptr;
 	wxSpinCtrl* _frames_in_memory_multiplier = nullptr;
-	wxCheckBox* _allow_any_dcp_frame_rate = nullptr;
-	wxCheckBox* _allow_any_container = nullptr;
-	wxCheckBox* _allow_96khz_audio = nullptr;
-	wxCheckBox* _show_experimental_audio_processors = nullptr;
-	wxCheckBox* _only_servers_encode = nullptr;
+	CheckBox* _allow_any_dcp_frame_rate = nullptr;
+	CheckBox* _allow_any_container = nullptr;
+	CheckBox* _allow_96khz_audio = nullptr;
+	CheckBox* _use_all_audio_channels = nullptr;
+	CheckBox* _show_experimental_audio_processors = nullptr;
+	CheckBox* _only_servers_encode = nullptr;
 	NameFormatEditor* _dcp_metadata_filename_format = nullptr;
 	NameFormatEditor* _dcp_asset_filename_format = nullptr;
-	wxCheckBox* _log_general = nullptr;
-	wxCheckBox* _log_warning = nullptr;
-	wxCheckBox* _log_error = nullptr;
-	wxCheckBox* _log_timing = nullptr;
-	wxCheckBox* _log_debug_threed = nullptr;
-	wxCheckBox* _log_debug_encode = nullptr;
-	wxCheckBox* _log_debug_email = nullptr;
-	wxCheckBox* _log_debug_video_view = nullptr;
-	wxCheckBox* _log_debug_player = nullptr;
-	wxCheckBox* _log_debug_audio_analysis = nullptr;
+	CheckBox* _log_general = nullptr;
+	CheckBox* _log_warning = nullptr;
+	CheckBox* _log_error = nullptr;
+	CheckBox* _log_timing = nullptr;
+	CheckBox* _log_debug_threed = nullptr;
+	CheckBox* _log_debug_encode = nullptr;
+	CheckBox* _log_debug_email = nullptr;
+	CheckBox* _log_debug_video_view = nullptr;
+	CheckBox* _log_debug_player = nullptr;
+	CheckBox* _log_debug_audio_analysis = nullptr;
 #ifdef DCPOMATIC_WINDOWS
-	wxCheckBox* _win32_console = nullptr;
+	CheckBox* _win32_console = nullptr;
 #endif
 };