XML metadata and some other bits.

4 files changed, 11 insertions, 13 deletions

diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc
index cf44eb69f..2a6210164 100644
--- a/src/wx/audio_plot.cc
+++ b/src/wx/audio_plot.cc
@@ -21,7 +21,6 @@
 #include <boost/bind.hpp>
 #include <wx/graphics.h>
 #include "audio_plot.h"
-#include "lib/decoder_factory.h"
 #include "lib/audio_decoder.h"
 #include "lib/audio_analysis.h"
 #include "wx/wx_util.h"
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 40f4f0362..560c4ef27 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -175,8 +175,8 @@ FilmEditor::make_film_panel ()
 	}
 	++r;
 
-	_dcp_ab = new wxCheckBox (_film_panel, wxID_ANY, _("A/B"));
-	grid->Add (_dcp_ab, wxGBPosition (r, 0));
+	_ab = new wxCheckBox (_film_panel, wxID_ANY, _("A/B"));
+	grid->Add (_ab, wxGBPosition (r, 0));
 	++r;
 
 	vector<DCPContentType const *> const ct = DCPContentType::all ();
@@ -212,7 +212,7 @@ FilmEditor::connect_to_widgets ()
 	_dcp_content_type->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (FilmEditor::dcp_content_type_changed), 0, this);
 	_dcp_frame_rate->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (FilmEditor::dcp_frame_rate_changed), 0, this);
 	_best_dcp_frame_rate->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::best_dcp_frame_rate_clicked), 0, this);
-	_dcp_ab->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (FilmEditor::dcp_ab_toggled), 0, this);
+	_ab->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (FilmEditor::ab_toggled), 0, this);
 	_trim_start->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::trim_start_changed), 0, this);
 	_trim_end->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::trim_end_changed), 0, this);
 	_with_subtitles->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (FilmEditor::with_subtitles_toggled), 0, this);
@@ -489,13 +489,13 @@ FilmEditor::trust_content_headers_changed (wxCommandEvent &)
 
 /** Called when the DCP A/B switch has been toggled */
 void
-FilmEditor::dcp_ab_toggled (wxCommandEvent &)
+FilmEditor::ab_toggled (wxCommandEvent &)
 {
 	if (!_film) {
 		return;
 	}
 	
-	_film->set_dcp_ab (_dcp_ab->GetValue ());
+	_film->set_ab (_ab->GetValue ());
 }
 
 /** Called when the name widget has been changed */
@@ -674,8 +674,8 @@ FilmEditor::film_changed (Film::Property p)
 		checked_set (_dcp_content_type, DCPContentType::as_index (_film->dcp_content_type ()));
 		setup_dcp_name ();
 		break;
-	case Film::DCP_AB:
-		checked_set (_dcp_ab, _film->dcp_ab ());
+	case Film::AB:
+		checked_set (_ab, _film->ab ());
 		break;
 	case Film::SCALER:
 		checked_set (_scaler, Scaler::as_index (_film->scaler ()));
@@ -811,7 +811,7 @@ FilmEditor::set_film (shared_ptr<Film> f)
 	film_changed (Film::SCALER);
 	film_changed (Film::TRIM_START);
 	film_changed (Film::TRIM_END);
-	film_changed (Film::DCP_AB);
+	film_changed (Film::AB);
 	film_changed (Film::AUDIO_GAIN);
 	film_changed (Film::AUDIO_DELAY);
 	film_changed (Film::WITH_SUBTITLES);
@@ -849,7 +849,7 @@ FilmEditor::set_things_sensitive (bool s)
 	_dcp_frame_rate->Enable (s);
 	_trim_start->Enable (s);
 	_trim_end->Enable (s);
-	_dcp_ab->Enable (s);
+	_ab->Enable (s);
 	_colour_lut->Enable (s);
 	_j2k_bandwidth->Enable (s);
 	_audio_gain->Enable (s);
diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 50457bdce..80072d48a 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -72,7 +72,7 @@ private:
 	void trim_start_changed (wxCommandEvent &);
 	void trim_end_changed (wxCommandEvent &);
 	void dcp_content_type_changed (wxCommandEvent &);
-	void dcp_ab_toggled (wxCommandEvent &);
+	void ab_toggled (wxCommandEvent &);
 	void scaler_changed (wxCommandEvent &);
 	void audio_gain_changed (wxCommandEvent &);
 	void audio_gain_calculate_button_clicked (wxCommandEvent &);
@@ -162,7 +162,7 @@ private:
 	wxSpinCtrl* _trim_start;
 	wxSpinCtrl* _trim_end;
 	/** Selector to generate an A/B comparison DCP */
-	wxCheckBox* _dcp_ab;
+	wxCheckBox* _ab;
 
 	std::vector<Format const *> _formats;
 
diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index b552a3dbc..74ab9798c 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -23,7 +23,6 @@
 
 #include <wx/wx.h>
 #include "lib/film.h"
-#include "lib/decoder_factory.h"
 
 class wxToggleButton;
 class FFmpegPlayer;