4 files changed, 0 insertions, 72 deletions
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 0b13b9c88..844b03ad7 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -57,8 +57,6 @@ ConfigDialog::ConfigDialog (wxWindow* parent)
 	_notebook->AddPage (_metadata_panel, _("Metadata"), false);
 	make_tms_panel ();
 	_notebook->AddPage (_tms_panel, _("TMS"), false);
-	make_ab_panel ();
-	_notebook->AddPage (_ab_panel, _("A/B mode"), false);
 
 	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
 	overall_sizer->Add (s, 1, wxEXPAND | wxALL, 6);
@@ -236,39 +234,6 @@ ConfigDialog::make_tms_panel ()
 }
 
 void
-ConfigDialog::make_ab_panel ()
-{
-	_ab_panel = new wxPanel (_notebook);
-	wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
-	_ab_panel->SetSizer (s);
-
-	wxFlexGridSizer* table = new wxFlexGridSizer (3, 6, 6);
-	table->AddGrowableCol (1, 1);
-	s->Add (table, 1, wxALL, 8);
-	
-	add_label_to_sizer (table, _ab_panel, _("Reference scaler"));
-	_reference_scaler = new wxChoice (_ab_panel, wxID_ANY);
-	vector<Scaler const *> const sc = Scaler::all ();
-	for (vector<Scaler const *>::const_iterator i = sc.begin(); i != sc.end(); ++i) {
-		_reference_scaler->Append (std_to_wx ((*i)->name ()));
-	}
-
-	table->Add (_reference_scaler, 1, wxEXPAND);
-	table->AddSpacer (0);
-
-	{
-		add_label_to_sizer (table, _ab_panel, _("Reference filters"));
-		wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-		_reference_filters = new wxStaticText (_ab_panel, wxID_ANY, wxT (""));
-		s->Add (_reference_filters, 1, wxEXPAND);
-		_reference_filters_button = new wxButton (_ab_panel, wxID_ANY, _("Edit..."));
-		s->Add (_reference_filters_button, 0);
-		table->Add (s, 1, wxEXPAND);
-		table->AddSpacer (0);
-	}
-}
-
-void
 ConfigDialog::make_metadata_panel ()
 {
 	_metadata_panel = new wxPanel (_notebook);
@@ -475,32 +440,6 @@ ConfigDialog::server_selection_changed (wxListEvent &)
 }
 
 void
-ConfigDialog::reference_scaler_changed (wxCommandEvent &)
-{
-	int const n = _reference_scaler->GetSelection ();
-	if (n >= 0) {
-		Config::instance()->set_reference_scaler (Scaler::from_index (n));
-	}
-}
-
-void
-ConfigDialog::edit_reference_filters_clicked (wxCommandEvent &)
-{
-	FilterDialog* d = new FilterDialog (this, Config::instance()->reference_filters ());
-	d->ActiveChanged.connect (boost::bind (&ConfigDialog::reference_filters_changed, this, _1));
-	d->ShowModal ();
-	d->Destroy ();
-}
-
-void
-ConfigDialog::reference_filters_changed (vector<Filter const *> f)
-{
-	Config::instance()->set_reference_filters (f);
-	pair<string, string> p = Filter::ffmpeg_strings (Config::instance()->reference_filters ());
-	_reference_filters->SetLabel (std_to_wx (p.first) + N_(" ") + std_to_wx (p.second));
-}
-
-void
 ConfigDialog::edit_default_dci_metadata_clicked (wxCommandEvent &)
 {
 	DCIMetadataDialog* d = new DCIMetadataDialog (this, Config::instance()->default_dci_metadata ());
diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index dda846b7d..3da48fd08 100644
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -50,9 +50,6 @@ private:
 	void default_still_length_changed (wxCommandEvent &);
 	void default_directory_changed (wxCommandEvent &);
 	void edit_default_dci_metadata_clicked (wxCommandEvent &);
-	void reference_scaler_changed (wxCommandEvent &);
-	void edit_reference_filters_clicked (wxCommandEvent &);
-	void reference_filters_changed (std::vector<Filter const *>);
 	void add_server_clicked (wxCommandEvent &);
 	void edit_server_clicked (wxCommandEvent &);
 	void remove_server_clicked (wxCommandEvent &);
@@ -68,13 +65,11 @@ private:
 	void make_misc_panel ();
 	void make_tms_panel ();
 	void make_metadata_panel ();
-	void make_ab_panel ();
 	void make_servers_panel ();
 
 	wxNotebook* _notebook;
 	wxPanel* _misc_panel;
 	wxPanel* _tms_panel;
-	wxPanel* _ab_panel;
 	wxPanel* _servers_panel;
 	wxPanel* _metadata_panel;
 	wxCheckBox* _set_language;
@@ -93,9 +88,6 @@ private:
 	wxDirPickerCtrl* _default_directory;
 #endif
 	wxButton* _default_dci_metadata_button;
-	wxChoice* _reference_scaler;
-	wxStaticText* _reference_filters;
-	wxButton* _reference_filters_button;
 	wxListCtrl* _servers;
 	wxButton* _add_server;
 	wxButton* _edit_server;
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index c96642124..12b316dff 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -32,7 +32,6 @@
 #include "lib/film.h"
 #include "lib/transcode_job.h"
 #include "lib/exceptions.h"
-#include "lib/ab_transcode_job.h"
 #include "lib/job_manager.h"
 #include "lib/filter.h"
 #include "lib/ratio.h"
diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc
index 1e0641ac4..40527ded7 100644
--- a/src/wx/properties_dialog.cc
+++ b/src/wx/properties_dialog.cc
@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
-
 /*
     Copyright (C) 2012 Carl Hetherington <cth@carlh.net>