Move DCP panel code into its own source file.

5 files changed, 698 insertions, 592 deletions

diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
new file mode 100644
index 000000000..410e7f6fe
--- /dev/null
+++ b/src/wx/dcp_panel.cc
@@ -0,0 +1,587 @@
+/*
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include "dcp_panel.h"
+#include "wx_util.h"
+#include "isdcf_metadata_dialog.h"
+#include "lib/ratio.h"
+#include "lib/scaler.h"
+#include "lib/config.h"
+#include "lib/dcp_content_type.h"
+#include "lib/util.h"
+#include "lib/film.h"
+#include "lib/ffmpeg_content.h"
+#include <wx/wx.h>
+#include <wx/notebook.h>
+#include <wx/gbsizer.h>
+#include <wx/spinctrl.h>
+#include <boost/lexical_cast.hpp>
+
+using std::list;
+using std::string;
+using std::vector;
+using boost::lexical_cast;
+using boost::shared_ptr;
+
+DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr<Film> f)
+	: _film (f)
+	, _generally_sensitive (true)
+{
+	_panel = new wxPanel (n);
+	_sizer = new wxBoxSizer (wxVERTICAL);
+	_panel->SetSizer (_sizer);
+
+	wxGridBagSizer* grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+	_sizer->Add (grid, 0, wxEXPAND | wxALL, 8);
+
+	int r = 0;
+	
+	add_label_to_grid_bag_sizer (grid, _panel, _("Name"), true, wxGBPosition (r, 0));
+	_name = new wxTextCtrl (_panel, wxID_ANY);
+	grid->Add (_name, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND | wxLEFT | wxRIGHT);
+	++r;
+	
+	add_label_to_grid_bag_sizer (grid, _panel, _("DCP Name"), true, wxGBPosition (r, 0));
+	_dcp_name = new wxStaticText (_panel, wxID_ANY, wxT (""));
+	grid->Add (_dcp_name, wxGBPosition(r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+	++r;
+
+	int flags = wxALIGN_CENTER_VERTICAL;
+#ifdef __WXOSX__
+	flags |= wxALIGN_RIGHT;
+#endif	
+
+	_use_isdcf_name = new wxCheckBox (_panel, wxID_ANY, _("Use ISDCF name"));
+	grid->Add (_use_isdcf_name, wxGBPosition (r, 0), wxDefaultSpan, flags);
+	_edit_isdcf_button = new wxButton (_panel, wxID_ANY, _("Details..."));
+	grid->Add (_edit_isdcf_button, wxGBPosition (r, 1), wxDefaultSpan);
+	++r;
+
+	add_label_to_grid_bag_sizer (grid, _panel, _("Container"), true, wxGBPosition (r, 0));
+	_container = new wxChoice (_panel, wxID_ANY);
+	grid->Add (_container, wxGBPosition (r, 1), wxDefaultSpan, wxEXPAND);
+	++r;
+
+	add_label_to_grid_bag_sizer (grid, _panel, _("Content Type"), true, wxGBPosition (r, 0));
+	_dcp_content_type = new wxChoice (_panel, wxID_ANY);
+	grid->Add (_dcp_content_type, wxGBPosition (r, 1));
+	++r;
+
+	{
+		add_label_to_grid_bag_sizer (grid, _panel, _("Frame Rate"), true, wxGBPosition (r, 0));
+		_frame_rate_sizer = new wxBoxSizer (wxHORIZONTAL);
+		_frame_rate_choice = new wxChoice (_panel, wxID_ANY);
+		_frame_rate_sizer->Add (_frame_rate_choice, 1, wxALIGN_CENTER_VERTICAL);
+		_frame_rate_spin = new wxSpinCtrl (_panel, wxID_ANY);
+		_frame_rate_sizer->Add (_frame_rate_spin, 1, wxALIGN_CENTER_VERTICAL);
+		setup_frame_rate_widget ();
+		_best_frame_rate = new wxButton (_panel, wxID_ANY, _("Use best"));
+		_frame_rate_sizer->Add (_best_frame_rate, 1, wxALIGN_CENTER_VERTICAL | wxEXPAND);
+		grid->Add (_frame_rate_sizer, wxGBPosition (r, 1));
+	}
+	++r;
+
+	_burn_subtitles = new wxCheckBox (_panel, wxID_ANY, _("Burn subtitles into image"));
+	grid->Add (_burn_subtitles, wxGBPosition (r, 0), wxGBSpan (1, 2));
+	++r;
+
+	_signed = new wxCheckBox (_panel, wxID_ANY, _("Signed"));
+	grid->Add (_signed, wxGBPosition (r, 0), wxGBSpan (1, 2));
+	++r;
+	
+	_encrypted = new wxCheckBox (_panel, wxID_ANY, _("Encrypted"));
+	grid->Add (_encrypted, wxGBPosition (r, 0), wxGBSpan (1, 2));
+	++r;
+
+	add_label_to_grid_bag_sizer (grid, _panel, _("Audio channels"), true, wxGBPosition (r, 0));
+	_audio_channels = new wxSpinCtrl (_panel, wxID_ANY);
+	grid->Add (_audio_channels, wxGBPosition (r, 1));
+	++r;
+
+	_three_d = new wxCheckBox (_panel, wxID_ANY, _("3D"));
+	grid->Add (_three_d, wxGBPosition (r, 0), wxGBSpan (1, 2));
+	++r;
+
+	add_label_to_grid_bag_sizer (grid, _panel, _("Resolution"), true, wxGBPosition (r, 0));
+	_resolution = new wxChoice (_panel, wxID_ANY);
+	grid->Add (_resolution, wxGBPosition (r, 1));
+	++r;
+
+	{
+		add_label_to_grid_bag_sizer (grid, _panel, _("JPEG2000 bandwidth"), true, wxGBPosition (r, 0));
+		wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+		_j2k_bandwidth = new wxSpinCtrl (_panel, wxID_ANY);
+		s->Add (_j2k_bandwidth, 1);
+		add_label_to_sizer (s, _panel, _("Mbit/s"), false);
+		grid->Add (s, wxGBPosition (r, 1));
+	}
+	++r;
+
+	add_label_to_grid_bag_sizer (grid, _panel, _("Standard"), true, wxGBPosition (r, 0));
+	_standard = new wxChoice (_panel, wxID_ANY);
+	grid->Add (_standard, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+	++r;
+
+	add_label_to_grid_bag_sizer (grid, _panel, _("Scaler"), true, wxGBPosition (r, 0));
+	_scaler = new wxChoice (_panel, wxID_ANY);
+	grid->Add (_scaler, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+	++r;
+
+	_name->Bind		(wxEVT_COMMAND_TEXT_UPDATED, 	      boost::bind (&DCPPanel::name_changed, this));
+	_use_isdcf_name->Bind	(wxEVT_COMMAND_CHECKBOX_CLICKED,      boost::bind (&DCPPanel::use_isdcf_name_toggled, this));
+	_edit_isdcf_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED,	      boost::bind (&DCPPanel::edit_isdcf_button_clicked, this));
+	_container->Bind	(wxEVT_COMMAND_CHOICE_SELECTED,	      boost::bind (&DCPPanel::container_changed, this));
+	_scaler->Bind		(wxEVT_COMMAND_CHOICE_SELECTED,	      boost::bind (&DCPPanel::scaler_changed, this));
+	_dcp_content_type->Bind	(wxEVT_COMMAND_CHOICE_SELECTED,	      boost::bind (&DCPPanel::dcp_content_type_changed, this));
+	_frame_rate_choice->Bind(wxEVT_COMMAND_CHOICE_SELECTED,	      boost::bind (&DCPPanel::frame_rate_choice_changed, this));
+	_frame_rate_spin->Bind  (wxEVT_COMMAND_SPINCTRL_UPDATED,      boost::bind (&DCPPanel::frame_rate_spin_changed, this));
+	_best_frame_rate->Bind	(wxEVT_COMMAND_BUTTON_CLICKED,	      boost::bind (&DCPPanel::best_frame_rate_clicked, this));
+	_burn_subtitles->Bind   (wxEVT_COMMAND_CHECKBOX_CLICKED,      boost::bind (&DCPPanel::burn_subtitles_toggled, this));
+	_signed->Bind           (wxEVT_COMMAND_CHECKBOX_CLICKED,      boost::bind (&DCPPanel::signed_toggled, this));
+	_encrypted->Bind        (wxEVT_COMMAND_CHECKBOX_CLICKED,      boost::bind (&DCPPanel::encrypted_toggled, this));
+	_audio_channels->Bind	(wxEVT_COMMAND_SPINCTRL_UPDATED,      boost::bind (&DCPPanel::audio_channels_changed, this));
+	_j2k_bandwidth->Bind	(wxEVT_COMMAND_SPINCTRL_UPDATED,      boost::bind (&DCPPanel::j2k_bandwidth_changed, this));
+	_resolution->Bind       (wxEVT_COMMAND_CHOICE_SELECTED,       boost::bind (&DCPPanel::resolution_changed, this));
+	_three_d->Bind	 	(wxEVT_COMMAND_CHECKBOX_CLICKED,      boost::bind (&DCPPanel::three_d_changed, this));
+	_standard->Bind         (wxEVT_COMMAND_CHOICE_SELECTED,       boost::bind (&DCPPanel::standard_changed, this));
+
+	vector<Scaler const *> const sc = Scaler::all ();
+	for (vector<Scaler const *>::const_iterator i = sc.begin(); i != sc.end(); ++i) {
+		_scaler->Append (std_to_wx ((*i)->name()));
+	}
+
+	vector<Ratio const *> const ratio = Ratio::all ();
+	for (vector<Ratio const *>::const_iterator i = ratio.begin(); i != ratio.end(); ++i) {
+		_container->Append (std_to_wx ((*i)->nickname ()));
+	}
+
+	vector<DCPContentType const *> const ct = DCPContentType::all ();
+	for (vector<DCPContentType const *>::const_iterator i = ct.begin(); i != ct.end(); ++i) {
+		_dcp_content_type->Append (std_to_wx ((*i)->pretty_name ()));
+	}
+
+	list<int> const dfr = Config::instance()->allowed_dcp_frame_rates ();
+	for (list<int>::const_iterator i = dfr.begin(); i != dfr.end(); ++i) {
+		_frame_rate_choice->Append (std_to_wx (boost::lexical_cast<string> (*i)));
+	}
+
+	_audio_channels->SetRange (0, MAX_DCP_AUDIO_CHANNELS);
+	_j2k_bandwidth->SetRange (1, Config::instance()->maximum_j2k_bandwidth() / 1000000);
+	_frame_rate_spin->SetRange (1, 480);
+
+	_resolution->Append (_("2K"));
+	_resolution->Append (_("4K"));
+
+	_standard->Append (_("SMPTE"));
+	_standard->Append (_("Interop"));
+
+	Config::instance()->Changed.connect (boost::bind (&DCPPanel::config_changed, this));
+}
+
+void
+DCPPanel::name_changed ()
+{
+	if (!_film) {
+		return;
+	}
+
+	_film->set_name (string (_name->GetValue().mb_str()));
+}
+
+void
+DCPPanel::j2k_bandwidth_changed ()
+{
+	if (!_film) {
+		return;
+	}
+	
+	_film->set_j2k_bandwidth (_j2k_bandwidth->GetValue() * 1000000);
+}
+
+void
+DCPPanel::signed_toggled ()
+{
+	if (!_film) {
+		return;
+	}
+
+	_film->set_signed (_signed->GetValue ());
+}
+
+void
+DCPPanel::burn_subtitles_toggled ()
+{
+	if (!_film) {
+		return;
+	}
+
+	_film->set_burn_subtitles (_burn_subtitles->GetValue ());
+}
+
+void
+DCPPanel::encrypted_toggled ()
+{
+	if (!_film) {
+		return;
+	}
+
+	_film->set_encrypted (_encrypted->GetValue ());
+}
+			       
+/** Called when the frame rate choice widget has been changed */
+void
+DCPPanel::frame_rate_choice_changed ()
+{
+	if (!_film) {
+		return;
+	}
+
+	_film->set_video_frame_rate (
+		boost::lexical_cast<int> (
+			wx_to_std (_frame_rate_choice->GetString (_frame_rate_choice->GetSelection ()))
+			)
+		);
+}
+
+/** Called when the frame rate spin widget has been changed */
+void
+DCPPanel::frame_rate_spin_changed ()
+{
+	if (!_film) {
+		return;
+	}
+
+	_film->set_video_frame_rate (_frame_rate_spin->GetValue ());
+}
+
+void
+DCPPanel::audio_channels_changed ()
+{
+	if (!_film) {
+		return;
+	}
+
+	_film->set_audio_channels (_audio_channels->GetValue ());
+}
+
+void
+DCPPanel::resolution_changed ()
+{
+	if (!_film) {
+		return;
+	}
+
+	_film->set_resolution (_resolution->GetSelection() == 0 ? RESOLUTION_2K : RESOLUTION_4K);
+}
+
+void
+DCPPanel::standard_changed ()
+{
+	if (!_film) {
+		return;
+	}
+
+	_film->set_interop (_standard->GetSelection() == 1);
+}
+
+void
+DCPPanel::film_changed (int p)
+{
+	switch (p) {
+	case Film::NONE:
+		break;
+	case Film::CONTAINER:
+		setup_container ();
+		break;
+	case Film::NAME:
+		checked_set (_name, _film->name());
+		setup_dcp_name ();
+		break;
+	case Film::DCP_CONTENT_TYPE:
+		checked_set (_dcp_content_type, DCPContentType::as_index (_film->dcp_content_type ()));
+		setup_dcp_name ();
+		break;
+	case Film::SCALER:
+		checked_set (_scaler, Scaler::as_index (_film->scaler ()));
+		break;
+	case Film::BURN_SUBTITLES:
+		checked_set (_burn_subtitles, _film->burn_subtitles ());
+		break;
+	case Film::SIGNED:
+		checked_set (_signed, _film->is_signed ());
+		break;
+	case Film::ENCRYPTED:
+		checked_set (_encrypted, _film->encrypted ());
+		if (_film->encrypted ()) {
+			_film->set_signed (true);
+			_signed->Enable (false);
+		} else {
+			_signed->Enable (_generally_sensitive);
+		}
+		break;
+	case Film::RESOLUTION:
+		checked_set (_resolution, _film->resolution() == RESOLUTION_2K ? 0 : 1);
+		setup_dcp_name ();
+		break;
+	case Film::J2K_BANDWIDTH:
+		checked_set (_j2k_bandwidth, _film->j2k_bandwidth() / 1000000);
+		break;
+	case Film::USE_ISDCF_NAME:
+		checked_set (_use_isdcf_name, _film->use_isdcf_name ());
+		setup_dcp_name ();
+		break;
+	case Film::ISDCF_METADATA:
+		setup_dcp_name ();
+		break;
+	case Film::VIDEO_FRAME_RATE:
+	{
+		bool done = false;
+		for (unsigned int i = 0; i < _frame_rate_choice->GetCount(); ++i) {
+			if (wx_to_std (_frame_rate_choice->GetString(i)) == boost::lexical_cast<string> (_film->video_frame_rate())) {
+				checked_set (_frame_rate_choice, i);
+				done = true;
+				break;
+			}
+		}
+
+		if (!done) {
+			checked_set (_frame_rate_choice, -1);
+		}
+
+		_frame_rate_spin->SetValue (_film->video_frame_rate ());
+
+		_best_frame_rate->Enable (_film->best_video_frame_rate () != _film->video_frame_rate ());
+		break;
+	}
+	case Film::AUDIO_CHANNELS:
+		checked_set (_audio_channels, _film->audio_channels ());
+		setup_dcp_name ();
+		break;
+	case Film::THREE_D:
+		checked_set (_three_d, _film->three_d ());
+		setup_dcp_name ();
+		break;
+	case Film::INTEROP:
+		checked_set (_standard, _film->interop() ? 1 : 0);
+		break;
+	default:
+		break;
+	}
+}
+
+void
+DCPPanel::film_content_changed (int property)
+{
+	if (property == FFmpegContentProperty::AUDIO_STREAM || property == SubtitleContentProperty::USE_SUBTITLES) {
+		setup_dcp_name ();
+	}
+}
+
+
+void
+DCPPanel::setup_container ()
+{
+	int n = 0;
+	vector<Ratio const *> ratios = Ratio::all ();
+	vector<Ratio const *>::iterator i = ratios.begin ();
+	while (i != ratios.end() && *i != _film->container ()) {
+		++i;
+		++n;
+	}
+	
+	if (i == ratios.end()) {
+		checked_set (_container, -1);
+	} else {
+		checked_set (_container, n);
+	}
+	
+	setup_dcp_name ();
+}	
+
+/** Called when the container widget has been changed */
+void
+DCPPanel::container_changed ()
+{
+	if (!_film) {
+		return;
+	}
+
+	int const n = _container->GetSelection ();
+	if (n >= 0) {
+		vector<Ratio const *> ratios = Ratio::all ();
+		assert (n < int (ratios.size()));
+		_film->set_container (ratios[n]);
+	}
+}
+
+/** Called when the DCP content type widget has been changed */
+void
+DCPPanel::dcp_content_type_changed ()
+{
+	if (!_film) {
+		return;
+	}
+
+	int const n = _dcp_content_type->GetSelection ();
+	if (n != wxNOT_FOUND) {
+		_film->set_dcp_content_type (DCPContentType::from_index (n));
+	}
+}
+
+void
+DCPPanel::set_film (shared_ptr<Film> film)
+{
+	_film = film;
+	
+	film_changed (Film::NAME);
+	film_changed (Film::USE_ISDCF_NAME);
+	film_changed (Film::CONTENT);
+	film_changed (Film::DCP_CONTENT_TYPE);
+	film_changed (Film::CONTAINER);
+	film_changed (Film::RESOLUTION);
+	film_changed (Film::SCALER);
+	film_changed (Film::SIGNED);
+	film_changed (Film::BURN_SUBTITLES);
+	film_changed (Film::ENCRYPTED);
+	film_changed (Film::J2K_BANDWIDTH);
+	film_changed (Film::ISDCF_METADATA);
+	film_changed (Film::VIDEO_FRAME_RATE);
+	film_changed (Film::AUDIO_CHANNELS);
+	film_changed (Film::SEQUENCE_VIDEO);
+	film_changed (Film::THREE_D);
+	film_changed (Film::INTEROP);
+}
+
+void
+DCPPanel::set_general_sensitivity (bool s)
+{
+	_name->Enable (s);
+	_use_isdcf_name->Enable (s);
+	_edit_isdcf_button->Enable (s);
+	_dcp_content_type->Enable (s);
+
+	bool si = s;
+	if (_film && _film->encrypted ()) {
+		si = false;
+	}
+	_burn_subtitles->Enable (s);
+	_signed->Enable (si);
+	
+	_encrypted->Enable (s);
+	_frame_rate_choice->Enable (s);
+	_frame_rate_spin->Enable (s);
+	_audio_channels->Enable (s);
+	_j2k_bandwidth->Enable (s);
+	_container->Enable (s);
+	_best_frame_rate->Enable (s && _film && _film->best_video_frame_rate () != _film->video_frame_rate ());
+	_resolution->Enable (s);
+	_scaler->Enable (s);
+	_three_d->Enable (s);
+	_standard->Enable (s);
+}
+
+/** Called when the scaler widget has been changed */
+void
+DCPPanel::scaler_changed ()
+{
+	if (!_film) {
+		return;
+	}
+
+	int const n = _scaler->GetSelection ();
+	if (n >= 0) {
+		_film->set_scaler (Scaler::from_index (n));
+	}
+}
+
+void
+DCPPanel::use_isdcf_name_toggled ()
+{
+	if (!_film) {
+		return;
+	}
+
+	_film->set_use_isdcf_name (_use_isdcf_name->GetValue ());
+}
+
+void
+DCPPanel::edit_isdcf_button_clicked ()
+{
+	if (!_film) {
+		return;
+	}
+
+	ISDCFMetadataDialog* d = new ISDCFMetadataDialog (_panel, _film->isdcf_metadata ());
+	d->ShowModal ();
+	_film->set_isdcf_metadata (d->isdcf_metadata ());
+	d->Destroy ();
+}
+
+void
+DCPPanel::setup_dcp_name ()
+{
+	string s = _film->dcp_name (true);
+	if (s.length() > 28) {
+		_dcp_name->SetLabel (std_to_wx (s.substr (0, 28)) + N_("..."));
+		_dcp_name->SetToolTip (std_to_wx (s));
+	} else {
+		_dcp_name->SetLabel (std_to_wx (s));
+	}
+}
+
+void
+DCPPanel::best_frame_rate_clicked ()
+{
+	if (!_film) {
+		return;
+	}
+	
+	_film->set_video_frame_rate (_film->best_video_frame_rate ());
+}
+
+void
+DCPPanel::three_d_changed ()
+{
+	if (!_film) {
+		return;
+	}
+
+	_film->set_three_d (_three_d->GetValue ());
+}
+
+void
+DCPPanel::config_changed ()
+{
+	_j2k_bandwidth->SetRange (1, Config::instance()->maximum_j2k_bandwidth() / 1000000);
+	setup_frame_rate_widget ();
+}
+
+void
+DCPPanel::setup_frame_rate_widget ()
+{
+	if (Config::instance()->allow_any_dcp_frame_rate ()) {
+		_frame_rate_choice->Hide ();
+		_frame_rate_spin->Show ();
+	} else {
+		_frame_rate_choice->Show ();
+		_frame_rate_spin->Hide ();
+	}
+
+	_frame_rate_sizer->Layout ();
+}
diff --git a/src/wx/dcp_panel.h b/src/wx/dcp_panel.h
new file mode 100644
index 000000000..51cab808d
--- /dev/null
+++ b/src/wx/dcp_panel.h
@@ -0,0 +1,101 @@
+/*
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <boost/shared_ptr.hpp>
+
+class wxNotebook;
+class wxPanel;
+class wxBoxSizer;
+class wxTextCtrl;
+class wxStaticText;
+class wxCheckBox;
+class wxChoice;
+class wxButton;
+class wxSpinCtrl;
+class wxSizer;
+
+class Film;
+
+class DCPPanel
+{
+public:
+	DCPPanel (wxNotebook *, boost::shared_ptr<Film>);
+
+	void set_film (boost::shared_ptr<Film>);
+	void set_general_sensitivity (bool);
+
+	void film_changed (int);
+	void film_content_changed (int);
+
+	wxPanel* panel () const {
+		return _panel;
+	}
+
+private:
+	void name_changed ();
+	void use_isdcf_name_toggled ();
+	void edit_isdcf_button_clicked ();
+	void container_changed ();
+	void dcp_content_type_changed ();
+	void scaler_changed ();
+	void j2k_bandwidth_changed ();
+	void frame_rate_choice_changed ();
+	void frame_rate_spin_changed ();
+	void best_frame_rate_clicked ();
+	void content_timeline_clicked ();
+	void audio_channels_changed ();
+	void resolution_changed ();
+	void three_d_changed ();
+	void standard_changed ();
+	void signed_toggled ();
+	void burn_subtitles_toggled ();
+	void encrypted_toggled ();
+
+	void setup_frame_rate_widget ();
+	void setup_container ();
+	void setup_dcp_name ();
+
+	void config_changed ();
+
+	wxPanel* _panel;
+	wxBoxSizer* _sizer;
+
+	wxTextCtrl* _name;
+	wxStaticText* _dcp_name;
+	wxCheckBox* _use_isdcf_name;
+	wxChoice* _container;
+	wxButton* _edit_isdcf_button;
+	wxChoice* _scaler;
+ 	wxSpinCtrl* _j2k_bandwidth;
+	wxChoice* _dcp_content_type;
+	wxChoice* _frame_rate_choice;
+	wxSpinCtrl* _frame_rate_spin;
+	wxSizer* _frame_rate_sizer;
+	wxSpinCtrl* _audio_channels;
+	wxButton* _best_frame_rate;
+	wxCheckBox* _three_d;
+	wxChoice* _resolution;
+	wxChoice* _standard;
+	wxCheckBox* _signed;
+	wxCheckBox* _burn_subtitles;
+	wxCheckBox* _encrypted;
+
+	boost::shared_ptr<Film> _film;
+	bool _generally_sensitive;
+};
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index d037ccd50..37a8c8808 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -48,13 +48,13 @@
 #include "timecode.h"
 #include "wx_util.h"
 #include "film_editor.h"
-#include "isdcf_metadata_dialog.h"
 #include "timeline_dialog.h"
 #include "timing_panel.h"
 #include "subtitle_panel.h"
 #include "audio_panel.h"
 #include "video_panel.h"
 #include "content_panel.h"
+#include "dcp_panel.h"
 
 using std::string;
 using std::cout;
@@ -73,7 +73,6 @@ using boost::lexical_cast;
 /** @param f Film to edit */
 FilmEditor::FilmEditor (shared_ptr<Film> f, wxWindow* parent)
 	: wxPanel (parent)
-	, _generally_sensitive (true)
 {
 	wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
 
@@ -82,283 +81,18 @@ FilmEditor::FilmEditor (shared_ptr<Film> f, wxWindow* parent)
 
 	_content_panel = new ContentPanel (_main_notebook, _film);
 	_main_notebook->AddPage (_content_panel->panel (), _("Content"), true);
-	make_dcp_panel ();
-	_main_notebook->AddPage (_dcp_panel, _("DCP"), false);
+	_dcp_panel = new DCPPanel (_main_notebook, _film);
+	_main_notebook->AddPage (_dcp_panel->panel (), _("DCP"), false);
 	
 	set_film (f);
-	connect_to_widgets ();
 
 	JobManager::instance()->ActiveJobsChanged.connect (
 		bind (&FilmEditor::active_jobs_changed, this, _1)
 		);
 
-	Config::instance()->Changed.connect (boost::bind (&FilmEditor::config_changed, this));
-	
 	SetSizerAndFit (s);
 }
 
-void
-FilmEditor::make_dcp_panel ()
-{
-	_dcp_panel = new wxPanel (_main_notebook);
-	_dcp_sizer = new wxBoxSizer (wxVERTICAL);
-	_dcp_panel->SetSizer (_dcp_sizer);
-
-	wxGridBagSizer* grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-	_dcp_sizer->Add (grid, 0, wxEXPAND | wxALL, 8);
-
-	int r = 0;
-	
-	add_label_to_grid_bag_sizer (grid, _dcp_panel, _("Name"), true, wxGBPosition (r, 0));
-	_name = new wxTextCtrl (_dcp_panel, wxID_ANY);
-	grid->Add (_name, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND | wxLEFT | wxRIGHT);
-	++r;
-	
-	add_label_to_grid_bag_sizer (grid, _dcp_panel, _("DCP Name"), true, wxGBPosition (r, 0));
-	_dcp_name = new wxStaticText (_dcp_panel, wxID_ANY, wxT (""));
-	grid->Add (_dcp_name, wxGBPosition(r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
-	++r;
-
-	int flags = wxALIGN_CENTER_VERTICAL;
-#ifdef __WXOSX__
-	flags |= wxALIGN_RIGHT;
-#endif	
-
-	_use_isdcf_name = new wxCheckBox (_dcp_panel, wxID_ANY, _("Use ISDCF name"));
-	grid->Add (_use_isdcf_name, wxGBPosition (r, 0), wxDefaultSpan, flags);
-	_edit_isdcf_button = new wxButton (_dcp_panel, wxID_ANY, _("Details..."));
-	grid->Add (_edit_isdcf_button, wxGBPosition (r, 1), wxDefaultSpan);
-	++r;
-
-	add_label_to_grid_bag_sizer (grid, _dcp_panel, _("Container"), true, wxGBPosition (r, 0));
-	_container = new wxChoice (_dcp_panel, wxID_ANY);
-	grid->Add (_container, wxGBPosition (r, 1), wxDefaultSpan, wxEXPAND);
-	++r;
-
-	add_label_to_grid_bag_sizer (grid, _dcp_panel, _("Content Type"), true, wxGBPosition (r, 0));
-	_dcp_content_type = new wxChoice (_dcp_panel, wxID_ANY);
-	grid->Add (_dcp_content_type, wxGBPosition (r, 1));
-	++r;
-
-	{
-		add_label_to_grid_bag_sizer (grid, _dcp_panel, _("Frame Rate"), true, wxGBPosition (r, 0));
-		_frame_rate_sizer = new wxBoxSizer (wxHORIZONTAL);
-		_frame_rate_choice = new wxChoice (_dcp_panel, wxID_ANY);
-		_frame_rate_sizer->Add (_frame_rate_choice, 1, wxALIGN_CENTER_VERTICAL);
-		_frame_rate_spin = new wxSpinCtrl (_dcp_panel, wxID_ANY);
-		_frame_rate_sizer->Add (_frame_rate_spin, 1, wxALIGN_CENTER_VERTICAL);
-		setup_frame_rate_widget ();
-		_best_frame_rate = new wxButton (_dcp_panel, wxID_ANY, _("Use best"));
-		_frame_rate_sizer->Add (_best_frame_rate, 1, wxALIGN_CENTER_VERTICAL | wxEXPAND);
-		grid->Add (_frame_rate_sizer, wxGBPosition (r, 1));
-	}
-	++r;
-
-	_burn_subtitles = new wxCheckBox (_dcp_panel, wxID_ANY, _("Burn subtitles into image"));
-	grid->Add (_burn_subtitles, wxGBPosition (r, 0), wxGBSpan (1, 2));
-	++r;
-
-	_signed = new wxCheckBox (_dcp_panel, wxID_ANY, _("Signed"));
-	grid->Add (_signed, wxGBPosition (r, 0), wxGBSpan (1, 2));
-	++r;
-	
-	_encrypted = new wxCheckBox (_dcp_panel, wxID_ANY, _("Encrypted"));
-	grid->Add (_encrypted, wxGBPosition (r, 0), wxGBSpan (1, 2));
-	++r;
-
-	add_label_to_grid_bag_sizer (grid, _dcp_panel, _("Audio channels"), true, wxGBPosition (r, 0));
-	_audio_channels = new wxSpinCtrl (_dcp_panel, wxID_ANY);
-	grid->Add (_audio_channels, wxGBPosition (r, 1));
-	++r;
-
-	_three_d = new wxCheckBox (_dcp_panel, wxID_ANY, _("3D"));
-	grid->Add (_three_d, wxGBPosition (r, 0), wxGBSpan (1, 2));
-	++r;
-
-	add_label_to_grid_bag_sizer (grid, _dcp_panel, _("Resolution"), true, wxGBPosition (r, 0));
-	_resolution = new wxChoice (_dcp_panel, wxID_ANY);
-	grid->Add (_resolution, wxGBPosition (r, 1));
-	++r;
-
-	{
-		add_label_to_grid_bag_sizer (grid, _dcp_panel, _("JPEG2000 bandwidth"), true, wxGBPosition (r, 0));
-		wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-		_j2k_bandwidth = new wxSpinCtrl (_dcp_panel, wxID_ANY);
-		s->Add (_j2k_bandwidth, 1);
-		add_label_to_sizer (s, _dcp_panel, _("Mbit/s"), false);
-		grid->Add (s, wxGBPosition (r, 1));
-	}
-	++r;
-
-	add_label_to_grid_bag_sizer (grid, _dcp_panel, _("Standard"), true, wxGBPosition (r, 0));
-	_standard = new wxChoice (_dcp_panel, wxID_ANY);
-	grid->Add (_standard, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
-	++r;
-
-	add_label_to_grid_bag_sizer (grid, _dcp_panel, _("Scaler"), true, wxGBPosition (r, 0));
-	_scaler = new wxChoice (_dcp_panel, wxID_ANY);
-	grid->Add (_scaler, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
-	++r;
-
-	vector<Scaler const *> const sc = Scaler::all ();
-	for (vector<Scaler const *>::const_iterator i = sc.begin(); i != sc.end(); ++i) {
-		_scaler->Append (std_to_wx ((*i)->name()));
-	}
-
-	vector<Ratio const *> const ratio = Ratio::all ();
-	for (vector<Ratio const *>::const_iterator i = ratio.begin(); i != ratio.end(); ++i) {
-		_container->Append (std_to_wx ((*i)->nickname ()));
-	}
-
-	vector<DCPContentType const *> const ct = DCPContentType::all ();
-	for (vector<DCPContentType const *>::const_iterator i = ct.begin(); i != ct.end(); ++i) {
-		_dcp_content_type->Append (std_to_wx ((*i)->pretty_name ()));
-	}
-
-	list<int> const dfr = Config::instance()->allowed_dcp_frame_rates ();
-	for (list<int>::const_iterator i = dfr.begin(); i != dfr.end(); ++i) {
-		_frame_rate_choice->Append (std_to_wx (boost::lexical_cast<string> (*i)));
-	}
-
-	_audio_channels->SetRange (0, MAX_DCP_AUDIO_CHANNELS);
-	_j2k_bandwidth->SetRange (1, Config::instance()->maximum_j2k_bandwidth() / 1000000);
-	_frame_rate_spin->SetRange (1, 480);
-
-	_resolution->Append (_("2K"));
-	_resolution->Append (_("4K"));
-
-	_standard->Append (_("SMPTE"));
-	_standard->Append (_("Interop"));
-}
-
-void
-FilmEditor::connect_to_widgets ()
-{
-	_name->Bind		(wxEVT_COMMAND_TEXT_UPDATED, 	      boost::bind (&FilmEditor::name_changed, this));
-	_use_isdcf_name->Bind	(wxEVT_COMMAND_CHECKBOX_CLICKED,      boost::bind (&FilmEditor::use_isdcf_name_toggled, this));
-	_edit_isdcf_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED,	      boost::bind (&FilmEditor::edit_isdcf_button_clicked, this));
-	_container->Bind	(wxEVT_COMMAND_CHOICE_SELECTED,	      boost::bind (&FilmEditor::container_changed, this));
-	_scaler->Bind		(wxEVT_COMMAND_CHOICE_SELECTED,	      boost::bind (&FilmEditor::scaler_changed, this));
-	_dcp_content_type->Bind	(wxEVT_COMMAND_CHOICE_SELECTED,	      boost::bind (&FilmEditor::dcp_content_type_changed, this));
-	_frame_rate_choice->Bind(wxEVT_COMMAND_CHOICE_SELECTED,	      boost::bind (&FilmEditor::frame_rate_choice_changed, this));
-	_frame_rate_spin->Bind  (wxEVT_COMMAND_SPINCTRL_UPDATED,      boost::bind (&FilmEditor::frame_rate_spin_changed, this));
-	_best_frame_rate->Bind	(wxEVT_COMMAND_BUTTON_CLICKED,	      boost::bind (&FilmEditor::best_frame_rate_clicked, this));
-	_burn_subtitles->Bind   (wxEVT_COMMAND_CHECKBOX_CLICKED,      boost::bind (&FilmEditor::burn_subtitles_toggled, this));
-	_signed->Bind           (wxEVT_COMMAND_CHECKBOX_CLICKED,      boost::bind (&FilmEditor::signed_toggled, this));
-	_encrypted->Bind        (wxEVT_COMMAND_CHECKBOX_CLICKED,      boost::bind (&FilmEditor::encrypted_toggled, this));
-	_audio_channels->Bind	(wxEVT_COMMAND_SPINCTRL_UPDATED,      boost::bind (&FilmEditor::audio_channels_changed, this));
-	_j2k_bandwidth->Bind	(wxEVT_COMMAND_SPINCTRL_UPDATED,      boost::bind (&FilmEditor::j2k_bandwidth_changed, this));
-	_resolution->Bind       (wxEVT_COMMAND_CHOICE_SELECTED,       boost::bind (&FilmEditor::resolution_changed, this));
-	_three_d->Bind	 	(wxEVT_COMMAND_CHECKBOX_CLICKED,      boost::bind (&FilmEditor::three_d_changed, this));
-	_standard->Bind         (wxEVT_COMMAND_CHOICE_SELECTED,       boost::bind (&FilmEditor::standard_changed, this));
-}
-
-/** Called when the name widget has been changed */
-void
-FilmEditor::name_changed ()
-{
-	if (!_film) {
-		return;
-	}
-
-	_film->set_name (string (_name->GetValue().mb_str()));
-}
-
-void
-FilmEditor::j2k_bandwidth_changed ()
-{
-	if (!_film) {
-		return;
-	}
-	
-	_film->set_j2k_bandwidth (_j2k_bandwidth->GetValue() * 1000000);
-}
-
-void
-FilmEditor::signed_toggled ()
-{
-	if (!_film) {
-		return;
-	}
-
-	_film->set_signed (_signed->GetValue ());
-}
-
-void
-FilmEditor::burn_subtitles_toggled ()
-{
-	if (!_film) {
-		return;
-	}
-
-	_film->set_burn_subtitles (_burn_subtitles->GetValue ());
-}
-
-void
-FilmEditor::encrypted_toggled ()
-{
-	if (!_film) {
-		return;
-	}
-
-	_film->set_encrypted (_encrypted->GetValue ());
-}
-			       
-/** Called when the frame rate choice widget has been changed */
-void
-FilmEditor::frame_rate_choice_changed ()
-{
-	if (!_film) {
-		return;
-	}
-
-	_film->set_video_frame_rate (
-		boost::lexical_cast<int> (
-			wx_to_std (_frame_rate_choice->GetString (_frame_rate_choice->GetSelection ()))
-			)
-		);
-}
-
-/** Called when the frame rate spin widget has been changed */
-void
-FilmEditor::frame_rate_spin_changed ()
-{
-	if (!_film) {
-		return;
-	}
-
-	_film->set_video_frame_rate (_frame_rate_spin->GetValue ());
-}
-
-void
-FilmEditor::audio_channels_changed ()
-{
-	if (!_film) {
-		return;
-	}
-
-	_film->set_audio_channels (_audio_channels->GetValue ());
-}
-
-void
-FilmEditor::resolution_changed ()
-{
-	if (!_film) {
-		return;
-	}
-
-	_film->set_resolution (_resolution->GetSelection() == 0 ? RESOLUTION_2K : RESOLUTION_4K);
-}
-
-void
-FilmEditor::standard_changed ()
-{
-	if (!_film) {
-		return;
-	}
-
-	_film->set_interop (_standard->GetSelection() == 1);
-}
 
 /** Called when the metadata stored in the Film object has changed;
  *  so that we can update the GUI.
@@ -373,90 +107,9 @@ FilmEditor::film_changed (Film::Property p)
 		return;
 	}
 
-	stringstream s;
-
 	_content_panel->film_changed (p);
+	_dcp_panel->film_changed (p);
 
-	switch (p) {
-	case Film::NONE:
-		break;
-	case Film::CONTAINER:
-		setup_container ();
-		break;
-	case Film::NAME:
-		checked_set (_name, _film->name());
-		setup_dcp_name ();
-		break;
-	case Film::DCP_CONTENT_TYPE:
-		checked_set (_dcp_content_type, DCPContentType::as_index (_film->dcp_content_type ()));
-		setup_dcp_name ();
-		break;
-	case Film::SCALER:
-		checked_set (_scaler, Scaler::as_index (_film->scaler ()));
-		break;
-	case Film::BURN_SUBTITLES:
-		checked_set (_burn_subtitles, _film->burn_subtitles ());
-		break;
-	case Film::SIGNED:
-		checked_set (_signed, _film->is_signed ());
-		break;
-	case Film::ENCRYPTED:
-		checked_set (_encrypted, _film->encrypted ());
-		if (_film->encrypted ()) {
-			_film->set_signed (true);
-			_signed->Enable (false);
-		} else {
-			_signed->Enable (_generally_sensitive);
-		}
-		break;
-	case Film::RESOLUTION:
-		checked_set (_resolution, _film->resolution() == RESOLUTION_2K ? 0 : 1);
-		setup_dcp_name ();
-		break;
-	case Film::J2K_BANDWIDTH:
-		checked_set (_j2k_bandwidth, _film->j2k_bandwidth() / 1000000);
-		break;
-	case Film::USE_ISDCF_NAME:
-		checked_set (_use_isdcf_name, _film->use_isdcf_name ());
-		setup_dcp_name ();
-		break;
-	case Film::ISDCF_METADATA:
-		setup_dcp_name ();
-		break;
-	case Film::VIDEO_FRAME_RATE:
-	{
-		bool done = false;
-		for (unsigned int i = 0; i < _frame_rate_choice->GetCount(); ++i) {
-			if (wx_to_std (_frame_rate_choice->GetString(i)) == boost::lexical_cast<string> (_film->video_frame_rate())) {
-				checked_set (_frame_rate_choice, i);
-				done = true;
-				break;
-			}
-		}
-
-		if (!done) {
-			checked_set (_frame_rate_choice, -1);
-		}
-
-		_frame_rate_spin->SetValue (_film->video_frame_rate ());
-
-		_best_frame_rate->Enable (_film->best_video_frame_rate () != _film->video_frame_rate ());
-		break;
-	}
-	case Film::AUDIO_CHANNELS:
-		checked_set (_audio_channels, _film->audio_channels ());
-		setup_dcp_name ();
-		break;
-	case Film::THREE_D:
-		checked_set (_three_d, _film->three_d ());
-		setup_dcp_name ();
-		break;
-	case Film::INTEROP:
-		checked_set (_standard, _film->interop() ? 1 : 0);
-		break;
-	default:
-		break;
-	}
 }
 
 void
@@ -472,60 +125,7 @@ FilmEditor::film_content_changed (int property)
 	}
 
 	_content_panel->film_content_changed (property);
-
-	if (property == FFmpegContentProperty::AUDIO_STREAM || property == SubtitleContentProperty::USE_SUBTITLES) {
-		setup_dcp_name ();
-	}
-}
-
-void
-FilmEditor::setup_container ()
-{
-	int n = 0;
-	vector<Ratio const *> ratios = Ratio::all ();
-	vector<Ratio const *>::iterator i = ratios.begin ();
-	while (i != ratios.end() && *i != _film->container ()) {
-		++i;
-		++n;
-	}
-	
-	if (i == ratios.end()) {
-		checked_set (_container, -1);
-	} else {
-		checked_set (_container, n);
-	}
-	
-	setup_dcp_name ();
-}	
-
-/** Called when the container widget has been changed */
-void
-FilmEditor::container_changed ()
-{
-	if (!_film) {
-		return;
-	}
-
-	int const n = _container->GetSelection ();
-	if (n >= 0) {
-		vector<Ratio const *> ratios = Ratio::all ();
-		assert (n < int (ratios.size()));
-		_film->set_container (ratios[n]);
-	}
-}
-
-/** Called when the DCP content type widget has been changed */
-void
-FilmEditor::dcp_content_type_changed ()
-{
-	if (!_film) {
-		return;
-	}
-
-	int const n = _dcp_content_type->GetSelection ();
-	if (n != wxNOT_FOUND) {
-		_film->set_dcp_content_type (DCPContentType::from_index (n));
-	}
+	_dcp_panel->film_content_changed (property);
 }
 
 /** Sets the Film that we are editing */
@@ -541,6 +141,7 @@ FilmEditor::set_film (shared_ptr<Film> f)
 	_film = f;
 
 	_content_panel->set_film (_film);
+	_dcp_panel->set_film (_film);
 
 	if (_film) {
 		_film->Changed.connect (bind (&FilmEditor::film_changed, this, _1));
@@ -553,24 +154,6 @@ FilmEditor::set_film (shared_ptr<Film> f)
 		FileChanged ("");
 	}
 
-	film_changed (Film::NAME);
-	film_changed (Film::USE_ISDCF_NAME);
-	film_changed (Film::CONTENT);
-	film_changed (Film::DCP_CONTENT_TYPE);
-	film_changed (Film::CONTAINER);
-	film_changed (Film::RESOLUTION);
-	film_changed (Film::SCALER);
-	film_changed (Film::SIGNED);
-	film_changed (Film::BURN_SUBTITLES);
-	film_changed (Film::ENCRYPTED);
-	film_changed (Film::J2K_BANDWIDTH);
-	film_changed (Film::ISDCF_METADATA);
-	film_changed (Film::VIDEO_FRAME_RATE);
-	film_changed (Film::AUDIO_CHANNELS);
-	film_changed (Film::SEQUENCE_VIDEO);
-	film_changed (Film::THREE_D);
-	film_changed (Film::INTEROP);
-
 	if (!_film->content().empty ()) {
 		_content_panel->set_selection (_film->content().front ());
 	}
@@ -579,71 +162,8 @@ FilmEditor::set_film (shared_ptr<Film> f)
 void
 FilmEditor::set_general_sensitivity (bool s)
 {
-	_generally_sensitive = s;
-
 	_content_panel->set_general_sensitivity (s);
-
-	/* Stuff in the Content / DCP tabs */
-	_name->Enable (s);
-	_use_isdcf_name->Enable (s);
-	_edit_isdcf_button->Enable (s);
-	_dcp_content_type->Enable (s);
-
-	bool si = s;
-	if (_film && _film->encrypted ()) {
-		si = false;
-	}
-	_burn_subtitles->Enable (s);
-	_signed->Enable (si);
-	
-	_encrypted->Enable (s);
-	_frame_rate_choice->Enable (s);
-	_frame_rate_spin->Enable (s);
-	_audio_channels->Enable (s);
-	_j2k_bandwidth->Enable (s);
-	_container->Enable (s);
-	_best_frame_rate->Enable (s && _film && _film->best_video_frame_rate () != _film->video_frame_rate ());
-	_resolution->Enable (s);
-	_scaler->Enable (s);
-	_three_d->Enable (s);
-	_standard->Enable (s);
-}
-
-/** Called when the scaler widget has been changed */
-void
-FilmEditor::scaler_changed ()
-{
-	if (!_film) {
-		return;
-	}
-
-	int const n = _scaler->GetSelection ();
-	if (n >= 0) {
-		_film->set_scaler (Scaler::from_index (n));
-	}
-}
-
-void
-FilmEditor::use_isdcf_name_toggled ()
-{
-	if (!_film) {
-		return;
-	}
-
-	_film->set_use_isdcf_name (_use_isdcf_name->GetValue ());
-}
-
-void
-FilmEditor::edit_isdcf_button_clicked ()
-{
-	if (!_film) {
-		return;
-	}
-
-	ISDCFMetadataDialog* d = new ISDCFMetadataDialog (this, _film->isdcf_metadata ());
-	d->ShowModal ();
-	_film->set_isdcf_metadata (d->isdcf_metadata ());
-	d->Destroy ();
+	_dcp_panel->set_general_sensitivity (s);
 }
 
 void
@@ -652,55 +172,3 @@ FilmEditor::active_jobs_changed (bool a)
 	set_general_sensitivity (!a);
 }
 
-void
-FilmEditor::setup_dcp_name ()
-{
-	string s = _film->dcp_name (true);
-	if (s.length() > 28) {
-		_dcp_name->SetLabel (std_to_wx (s.substr (0, 28)) + N_("..."));
-		_dcp_name->SetToolTip (std_to_wx (s));
-	} else {
-		_dcp_name->SetLabel (std_to_wx (s));
-	}
-}
-
-void
-FilmEditor::best_frame_rate_clicked ()
-{
-	if (!_film) {
-		return;
-	}
-	
-	_film->set_video_frame_rate (_film->best_video_frame_rate ());
-}
-
-void
-FilmEditor::three_d_changed ()
-{
-	if (!_film) {
-		return;
-	}
-
-	_film->set_three_d (_three_d->GetValue ());
-}
-
-void
-FilmEditor::config_changed ()
-{
-	_j2k_bandwidth->SetRange (1, Config::instance()->maximum_j2k_bandwidth() / 1000000);
-	setup_frame_rate_widget ();
-}
-
-void
-FilmEditor::setup_frame_rate_widget ()
-{
-	if (Config::instance()->allow_any_dcp_frame_rate ()) {
-		_frame_rate_choice->Hide ();
-		_frame_rate_spin->Show ();
-	} else {
-		_frame_rate_choice->Show ();
-		_frame_rate_spin->Hide ();
-	}
-
-	_frame_rate_sizer->Layout ();
-}
diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 12a314abb..28baf410c 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -30,6 +30,7 @@ class wxSpinCtrl;
 class Film;
 class Ratio;
 class ContentPanel;
+class DCPPanel;
 
 /** @class FilmEditor
  *  @brief A wx widget to edit a film's metadata, and perform various functions.
@@ -54,69 +55,17 @@ public:
 	}
 
 private:
-	void make_dcp_panel ();
-	void connect_to_widgets ();
-	
-	/* Handle changes to the view */
-	void name_changed ();
-	void use_isdcf_name_toggled ();
-	void edit_isdcf_button_clicked ();
-	void container_changed ();
-	void dcp_content_type_changed ();
-	void scaler_changed ();
-	void j2k_bandwidth_changed ();
-	void frame_rate_choice_changed ();
-	void frame_rate_spin_changed ();
-	void best_frame_rate_clicked ();
-	void content_timeline_clicked ();
-	void audio_channels_changed ();
-	void resolution_changed ();
-	void three_d_changed ();
-	void standard_changed ();
-	void signed_toggled ();
-	void burn_subtitles_toggled ();
-	void encrypted_toggled ();
-
 	/* Handle changes to the model */
 	void film_changed (Film::Property);
 	void film_content_changed (int);
 
 	void set_general_sensitivity (bool);
-	void setup_dcp_name ();
-	void setup_container ();
-	void setup_frame_rate_widget ();
-	
 	void active_jobs_changed (bool);
-	void config_changed ();
 
 	wxNotebook* _main_notebook;
-	wxPanel* _dcp_panel;
-	wxSizer* _dcp_sizer;
 	ContentPanel* _content_panel;
+	DCPPanel* _dcp_panel;
 
 	/** The film we are editing */
 	boost::shared_ptr<Film> _film;
-	wxTextCtrl* _name;
-	wxStaticText* _dcp_name;
-	wxCheckBox* _use_isdcf_name;
-	wxChoice* _container;
-	wxButton* _edit_isdcf_button;
-	wxChoice* _scaler;
- 	wxSpinCtrl* _j2k_bandwidth;
-	wxChoice* _dcp_content_type;
-	wxChoice* _frame_rate_choice;
-	wxSpinCtrl* _frame_rate_spin;
-	wxSizer* _frame_rate_sizer;
-	wxSpinCtrl* _audio_channels;
-	wxButton* _best_frame_rate;
-	wxCheckBox* _three_d;
-	wxChoice* _resolution;
-	wxChoice* _standard;
-	wxCheckBox* _signed;
-	wxCheckBox* _burn_subtitles;
-	wxCheckBox* _encrypted;
-
-	std::vector<Ratio const *> _ratios;
-
-	bool _generally_sensitive;
 };
diff --git a/src/wx/wscript b/src/wx/wscript
index bb1a1b76f..d6e573891 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -17,6 +17,7 @@ sources = """
           content_menu.cc
           content_panel.cc
           content_sub_panel.cc
+          dcp_panel.cc
           isdcf_metadata_dialog.cc
           dir_picker_ctrl.cc
           dolby_certificate_dialog.cc