X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.cc;h=12ba7c1bc69dca45b6272b3324fd9471c00e2345;hb=53eb16342d492236aca77e4b73c0911a5d5eec9f;hp=e2a31d8d4244d625414c2617e0022a186dc5a240;hpb=f3145f04ac18d161551f2eb3348f16e55a6e9b5c;p=dcpomatic.git

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index e2a31d8d4..12ba7c1bc 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -24,6 +24,7 @@
 #include <iostream>
 #include <iomanip>
 #include <wx/wx.h>
+#include <wx/notebook.h>
 #include <boost/thread.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/lexical_cast.hpp>
@@ -34,17 +35,20 @@
 #include "lib/ab_transcode_job.h"
 #include "lib/job_manager.h"
 #include "lib/filter.h"
-#include "lib/screen.h"
 #include "lib/config.h"
+#include "lib/ffmpeg_decoder.h"
+#include "lib/external_audio_decoder.h"
 #include "filter_dialog.h"
 #include "wx_util.h"
 #include "film_editor.h"
 #include "gain_calculator_dialog.h"
 #include "sound_processor.h"
-#include "dci_name_dialog.h"
+#include "dci_metadata_dialog.h"
 #include "scaler.h"
+#include "audio_dialog.h"
 
 using std::string;
+using std::cout;
 using std::stringstream;
 using std::pair;
 using std::fixed;
@@ -52,231 +56,376 @@ using std::setprecision;
 using std::list;
 using std::vector;
 using boost::shared_ptr;
+using boost::dynamic_pointer_cast;
 
 /** @param f Film to edit */
 FilmEditor::FilmEditor (shared_ptr<Film> f, wxWindow* parent)
 	: wxPanel (parent)
 	, _film (f)
+	, _generally_sensitive (true)
+	, _audio_dialog (0)
 {
-	_sizer = new wxFlexGridSizer (2, 4, 4);
-	SetSizer (_sizer);
+	wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
+	SetSizer (s);
+	_notebook = new wxNotebook (this, wxID_ANY);
+	s->Add (_notebook, 1);
+
+	make_film_panel ();
+	_notebook->AddPage (_film_panel, _("Film"), true);
+	make_video_panel ();
+	_notebook->AddPage (_video_panel, _("Video"), false);
+	make_audio_panel ();
+	_notebook->AddPage (_audio_panel, _("Audio"), false);
+	make_subtitle_panel ();
+	_notebook->AddPage (_subtitle_panel, _("Subtitles"), false);
+
+	set_film (_film);
+	connect_to_widgets ();
 
-	add_label_to_sizer (_sizer, this, "Name");
-	_name = new wxTextCtrl (this, wxID_ANY);
-	_sizer->Add (_name, 1, wxEXPAND);
+	JobManager::instance()->ActiveJobsChanged.connect (
+		bind (&FilmEditor::active_jobs_changed, this, _1)
+		);
+	
+	setup_visibility ();
+	setup_formats ();
+}
 
-	add_label_to_sizer (_sizer, this, "DCP Name");
-	_dcp_name = new wxStaticText (this, wxID_ANY, wxT (""));
-	_sizer->Add (_dcp_name, 0, wxALIGN_CENTER_VERTICAL | wxSHRINK);
+void
+FilmEditor::make_film_panel ()
+{
+	_film_panel = new wxPanel (_notebook);
+	_film_sizer = new wxBoxSizer (wxVERTICAL);
+	_film_panel->SetSizer (_film_sizer);
 
-	_use_dci_name = new wxCheckBox (this, wxID_ANY, wxT ("Use DCI name"));
-	_sizer->Add (_use_dci_name, 1, wxEXPAND);
-	_edit_dci_button = new wxButton (this, wxID_ANY, wxT ("Details..."));
-	_sizer->Add (_edit_dci_button, 0);
+	wxGridBagSizer* grid = new wxGridBagSizer (6, 6);
+	_film_sizer->Add (grid, 0, wxALL, 8);
 
-	add_label_to_sizer (_sizer, this, "Content");
-	_content = new wxFilePickerCtrl (this, wxID_ANY, wxT (""), wxT ("Select Content File"), wxT("*.*"));
-	_sizer->Add (_content, 1, wxEXPAND);
+	int r = 0;
+	
+	add_label_to_grid_bag_sizer (grid, _film_panel, _("Name"), wxGBPosition (r, 0));
+	_name = new wxTextCtrl (_film_panel, wxID_ANY);
+	grid->Add (_name, wxGBPosition(r, 1));
+	++r;
+	
+	add_label_to_grid_bag_sizer (grid, _film_panel, _("DCP Name"), wxGBPosition (r, 0));
+	_dcp_name = new wxStaticText (_film_panel, wxID_ANY, wxT (""));
+	grid->Add (_dcp_name, wxGBPosition(r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+	++r;
+
+	_use_dci_name = new wxCheckBox (_film_panel, wxID_ANY, _("Use DCI name"));
+	grid->Add (_use_dci_name, wxGBPosition (r, 0));
+	_edit_dci_button = new wxButton (_film_panel, wxID_ANY, _("Details..."));
+	grid->Add (_edit_dci_button, wxGBPosition (r, 1), wxDefaultSpan);
+	++r;
+
+	add_label_to_grid_bag_sizer (grid, _film_panel, _("Content"), wxGBPosition (r, 0));
+	_content = new wxFilePickerCtrl (_film_panel, wxID_ANY, wxT (""), _("Select Content File"), wxT("*.*"));
+	grid->Add (_content, wxGBPosition (r, 1), wxDefaultSpan, wxEXPAND);
+	++r;
+
+	_trust_content_header = new wxCheckBox (_film_panel, wxID_ANY, _("Trust content's header"));
+	video_control (_trust_content_header);
+	grid->Add (_trust_content_header, wxGBPosition (r, 0), wxGBSpan(1, 2));
+	++r;
+
+	add_label_to_grid_bag_sizer (grid, _film_panel, _("Content Type"), wxGBPosition (r, 0));
+	_dcp_content_type = new wxChoice (_film_panel, wxID_ANY);
+	grid->Add (_dcp_content_type, wxGBPosition (r, 1));
+	++r;
+
+	video_control (add_label_to_grid_bag_sizer (grid, _film_panel, _("Original Frame Rate"), wxGBPosition (r, 0)));
+	_source_frame_rate = new wxStaticText (_film_panel, wxID_ANY, wxT (""));
+	grid->Add (video_control (_source_frame_rate), wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+	++r;
 
-	add_label_to_sizer (_sizer, this, "Content Type");
-	_dcp_content_type = new wxComboBox (this, wxID_ANY);
-	_sizer->Add (_dcp_content_type);
+	{
+		add_label_to_grid_bag_sizer (grid, _film_panel, _("DCP Frame Rate"), wxGBPosition (r, 0));
+		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+		_dcp_frame_rate = new wxChoice (_film_panel, wxID_ANY);
+		s->Add (_dcp_frame_rate, 1, wxALIGN_CENTER_VERTICAL);
+		_best_dcp_frame_rate = new wxButton (_film_panel, wxID_ANY, _("Use best"));
+		s->Add (_best_dcp_frame_rate, 1, wxALIGN_CENTER_VERTICAL | wxALL | wxEXPAND, 6);
+		grid->Add (s, wxGBPosition (r, 1));
+	}
+	++r;
+
+	_frame_rate_explanation = new wxStaticText (_film_panel, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE);
+	grid->Add (video_control (_frame_rate_explanation), wxGBPosition (r, 0), wxGBSpan (1, 2), wxEXPAND | wxALIGN_CENTER_VERTICAL);
+	wxFont font = _frame_rate_explanation->GetFont();
+	font.SetStyle(wxFONTSTYLE_ITALIC);
+	font.SetPointSize(font.GetPointSize() - 1);
+	_frame_rate_explanation->SetFont(font);
+	++r;
+	
+	video_control (add_label_to_grid_bag_sizer (grid, _film_panel, _("Original Size"), wxGBPosition (r, 0)));
+	_original_size = new wxStaticText (_film_panel, wxID_ANY, wxT (""));
+	grid->Add (video_control (_original_size), wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+	++r;
+	
+	video_control (add_label_to_grid_bag_sizer (grid, _film_panel, _("Length"), wxGBPosition (r, 0)));
+	_length = new wxStaticText (_film_panel, wxID_ANY, wxT (""));
+	grid->Add (video_control (_length), wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
+	++r;
 
-	add_label_to_sizer (_sizer, this, "Format");
-	_format = new wxComboBox (this, wxID_ANY);
-	_sizer->Add (_format);
 
 	{
-		add_label_to_sizer (_sizer, this, "Crop");
+		video_control (add_label_to_grid_bag_sizer (grid, _film_panel, _("Trim frames"), wxGBPosition (r, 0)));
 		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+		video_control (add_label_to_sizer (s, _film_panel, _("Start")));
+		_trim_start = new wxSpinCtrl (_film_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
+		s->Add (video_control (_trim_start));
+		video_control (add_label_to_sizer (s, _film_panel, _("End")));
+		_trim_end = new wxSpinCtrl (_film_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
+		s->Add (video_control (_trim_end));
+
+		grid->Add (s, wxGBPosition (r, 1));
+	}
+	++r;
+
+	_dcp_ab = new wxCheckBox (_film_panel, wxID_ANY, _("A/B"));
+	video_control (_dcp_ab);
+	grid->Add (_dcp_ab, wxGBPosition (r, 0));
+	++r;
 
-		add_label_to_sizer (s, this, "L");
-		_left_crop = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
-		s->Add (_left_crop, 0);
-		add_label_to_sizer (s, this, "R");
-		_right_crop = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
-		s->Add (_right_crop, 0);
-		add_label_to_sizer (s, this, "T");
-		_top_crop = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
-		s->Add (_top_crop, 0);
-		add_label_to_sizer (s, this, "B");
-		_bottom_crop = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
-		s->Add (_bottom_crop, 0);
+	/* STILL-only stuff */
+	{
+		still_control (add_label_to_grid_bag_sizer (grid, _film_panel, _("Duration"), wxGBPosition (r, 0)));
+		wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+		_still_duration = new wxSpinCtrl (_film_panel);
+		still_control (_still_duration);
+		s->Add (_still_duration, 1, wxEXPAND);
+		/// TRANSLATORS: `s' here is an abbreviation for seconds, the unit of time
+		still_control (add_label_to_sizer (s, _film_panel, _("s")));
+		grid->Add (s, wxGBPosition (r, 1));
+	}
+	++r;
+
+	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 ()));
+	}
 
-		_sizer->Add (s);
+	list<int> const dfr = Config::instance()->allowed_dcp_frame_rates ();
+	for (list<int>::const_iterator i = dfr.begin(); i != dfr.end(); ++i) {
+		_dcp_frame_rate->Append (std_to_wx (boost::lexical_cast<string> (*i)));
 	}
+}
+
+void
+FilmEditor::connect_to_widgets ()
+{
+	_name->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (FilmEditor::name_changed), 0, this);
+	_use_dci_name->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (FilmEditor::use_dci_name_toggled), 0, this);
+	_edit_dci_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::edit_dci_button_clicked), 0, this);
+	_format->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (FilmEditor::format_changed), 0, this);
+	_content->Connect (wxID_ANY, wxEVT_COMMAND_FILEPICKER_CHANGED, wxCommandEventHandler (FilmEditor::content_changed), 0, this);
+	_trust_content_header->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (FilmEditor::trust_content_header_changed), 0, this);
+	_left_crop->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::left_crop_changed), 0, this);
+	_right_crop->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::right_crop_changed), 0, this);
+	_top_crop->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::top_crop_changed), 0, this);
+	_bottom_crop->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::bottom_crop_changed), 0, this);
+	_filters_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::edit_filters_clicked), 0, this);
+	_scaler->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (FilmEditor::scaler_changed), 0, this);
+	_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);
+	_still_duration->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::still_duration_changed), 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);
+	_subtitle_offset->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::subtitle_offset_changed), 0, this);
+	_subtitle_scale->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::subtitle_scale_changed), 0, this);
+	_colour_lut->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (FilmEditor::colour_lut_changed), 0, this);
+	_j2k_bandwidth->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::j2k_bandwidth_changed), 0, this);
+	_subtitle_stream->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (FilmEditor::subtitle_stream_changed), 0, this);
+	_audio_stream->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (FilmEditor::audio_stream_changed), 0, this);
+	_audio_gain->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::audio_gain_changed), 0, this);
+	_audio_gain_calculate_button->Connect (
+		wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::audio_gain_calculate_button_clicked), 0, this
+		);
+	_show_audio->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::show_audio_clicked), 0, this);
+	_audio_delay->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::audio_delay_changed), 0, this);
+	_use_content_audio->Connect (wxID_ANY, wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler (FilmEditor::use_audio_changed), 0, this);
+	_use_external_audio->Connect (wxID_ANY, wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler (FilmEditor::use_audio_changed), 0, this);
+	for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
+		_external_audio[i]->Connect (
+			wxID_ANY, wxEVT_COMMAND_FILEPICKER_CHANGED, wxCommandEventHandler (FilmEditor::external_audio_changed), 0, this
+			);
+	}
+}
+
+void
+FilmEditor::make_video_panel ()
+{
+	_video_panel = new wxPanel (_notebook);
+	_video_sizer = new wxBoxSizer (wxVERTICAL);
+	_video_panel->SetSizer (_video_sizer);
+	
+	wxFlexGridSizer* grid = new wxFlexGridSizer (2, 4, 4);
+	_video_sizer->Add (grid, 0, wxALL, 8);
+
+	add_label_to_sizer (grid, _video_panel, _("Format"));
+	_format = new wxChoice (_video_panel, wxID_ANY);
+	grid->Add (_format);
+
+	add_label_to_sizer (grid, _video_panel, _("Left crop"));
+	_left_crop = new wxSpinCtrl (_video_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
+	grid->Add (_left_crop);
+
+	add_label_to_sizer (grid, _video_panel, _("Right crop"));
+	_right_crop = new wxSpinCtrl (_video_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
+	grid->Add (_right_crop);
+	
+	add_label_to_sizer (grid, _video_panel, _("Top crop"));
+	_top_crop = new wxSpinCtrl (_video_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
+	grid->Add (_top_crop);
+	
+	add_label_to_sizer (grid, _video_panel, _("Bottom crop"));
+	_bottom_crop = new wxSpinCtrl (_video_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
+	grid->Add (_bottom_crop);
 
 	/* VIDEO-only stuff */
 	{
-		video_control (add_label_to_sizer (_sizer, this, "Filters"));
+		video_control (add_label_to_sizer (grid, _video_panel, _("Filters")));
 		wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-		_filters = new wxStaticText (this, wxID_ANY, wxT ("None"));
+		_filters = new wxStaticText (_video_panel, wxID_ANY, _("None"));
 		video_control (_filters);
 		s->Add (_filters, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
-		_filters_button = new wxButton (this, wxID_ANY, wxT ("Edit..."));
+		_filters_button = new wxButton (_video_panel, wxID_ANY, _("Edit..."));
 		video_control (_filters_button);
 		s->Add (_filters_button, 0);
-		_sizer->Add (s, 1);
+		grid->Add (s, 1);
 	}
 
-	video_control (add_label_to_sizer (_sizer, this, "Scaler"));
-	_scaler = new wxComboBox (this, wxID_ANY);
-	_sizer->Add (video_control (_scaler), 1);
+	video_control (add_label_to_sizer (grid, _video_panel, _("Scaler")));
+	_scaler = new wxChoice (_video_panel, wxID_ANY);
+	grid->Add (video_control (_scaler), 1);
 
-	{
-		video_control (add_label_to_sizer (_sizer, this, "Audio Stream"));
-		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-		_audio_stream = new wxComboBox (this, wxID_ANY);
-		s->Add (video_control (_audio_stream), 1);
-		_audio = new wxStaticText (this, wxID_ANY, wxT (""));
-		s->Add (video_control (_audio), 1, wxALIGN_CENTER_VERTICAL | wxLEFT, 8);
-		_sizer->Add (s, 1, wxEXPAND);
+	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()));
 	}
 
-	{
-		video_control (add_label_to_sizer (_sizer, this, "Audio Gain"));
-		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-		_audio_gain = new wxSpinCtrl (this);
-		s->Add (video_control (_audio_gain), 1);
-		video_control (add_label_to_sizer (s, this, "dB"));
-		_audio_gain_calculate_button = new wxButton (this, wxID_ANY, _("Calculate..."));
-		video_control (_audio_gain_calculate_button);
-		s->Add (_audio_gain_calculate_button, 1, wxEXPAND);
-		_sizer->Add (s);
+	add_label_to_sizer (grid, _video_panel, _("Colour look-up table"));
+	_colour_lut = new wxChoice (_video_panel, wxID_ANY);
+	for (int i = 0; i < 2; ++i) {
+		_colour_lut->Append (std_to_wx (colour_lut_index_to_name (i)));
 	}
+	_colour_lut->SetSelection (0);
+	grid->Add (_colour_lut, 1, wxEXPAND);
 
 	{
-		video_control (add_label_to_sizer (_sizer, this, "Audio Delay"));
-		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-		_audio_delay = new wxSpinCtrl (this);
-		s->Add (video_control (_audio_delay), 1);
-		video_control (add_label_to_sizer (s, this, "ms"));
-		_sizer->Add (s);
+		add_label_to_sizer (grid, _video_panel, _("JPEG2000 bandwidth"));
+		wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+		_j2k_bandwidth = new wxSpinCtrl (_video_panel, wxID_ANY);
+		s->Add (_j2k_bandwidth, 1);
+		add_label_to_sizer (s, _video_panel, _("MBps"));
+		grid->Add (s, 1);
 	}
 
-	_with_subtitles = new wxCheckBox (this, wxID_ANY, wxT("With Subtitles"));
-	video_control (_with_subtitles);
-	_sizer->Add (_with_subtitles, 1);
+	_left_crop->SetRange (0, 1024);
+	_top_crop->SetRange (0, 1024);
+	_right_crop->SetRange (0, 1024);
+	_bottom_crop->SetRange (0, 1024);
+	_still_duration->SetRange (1, 60 * 60);
+	_trim_start->SetRange (0, 100);
+	_trim_end->SetRange (0, 100);
+	_j2k_bandwidth->SetRange (50, 250);
+}
+
+void
+FilmEditor::make_audio_panel ()
+{
+	_audio_panel = new wxPanel (_notebook);
+	_audio_sizer = new wxBoxSizer (wxVERTICAL);
+	_audio_panel->SetSizer (_audio_sizer);
 	
-	_subtitle_stream = new wxComboBox (this, wxID_ANY);
-	_sizer->Add (_subtitle_stream);
+	wxFlexGridSizer* grid = new wxFlexGridSizer (2, 4, 4);
+	_audio_sizer->Add (grid, 0, wxALL, 8);
 
-	video_control (add_label_to_sizer (_sizer, this, "Subtitle Offset"));
-	_subtitle_offset = new wxSpinCtrl (this);
-	_sizer->Add (video_control (_subtitle_offset), 1);
+	_show_audio = new wxButton (_audio_panel, wxID_ANY, _("Show Audio..."));
+	grid->Add (_show_audio, 1);
+	grid->AddSpacer (0);
 
 	{
-		video_control (add_label_to_sizer (_sizer, this, "Subtitle Scale"));
+		video_control (add_label_to_sizer (grid, _audio_panel, _("Audio Gain")));
 		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-		_subtitle_scale = new wxSpinCtrl (this);
-		s->Add (video_control (_subtitle_scale));
-		video_control (add_label_to_sizer (s, this, "%"));
-		_sizer->Add (s);
+		_audio_gain = new wxSpinCtrl (_audio_panel);
+		s->Add (video_control (_audio_gain), 1);
+		video_control (add_label_to_sizer (s, _audio_panel, _("dB")));
+		_audio_gain_calculate_button = new wxButton (_audio_panel, wxID_ANY, _("Calculate..."));
+		video_control (_audio_gain_calculate_button);
+		s->Add (_audio_gain_calculate_button, 1, wxEXPAND);
+		grid->Add (s);
 	}
-	
-	video_control (add_label_to_sizer (_sizer, this, "Frames Per Second"));
-	_frames_per_second = new wxStaticText (this, wxID_ANY, wxT (""));
-	_sizer->Add (video_control (_frames_per_second), 1, wxALIGN_CENTER_VERTICAL);
-	
-	video_control (add_label_to_sizer (_sizer, this, "Original Size"));
-	_original_size = new wxStaticText (this, wxID_ANY, wxT (""));
-	_sizer->Add (video_control (_original_size), 1, wxALIGN_CENTER_VERTICAL);
-	
-	video_control (add_label_to_sizer (_sizer, this, "Length"));
-	_length = new wxStaticText (this, wxID_ANY, wxT (""));
-	_sizer->Add (video_control (_length), 1, wxALIGN_CENTER_VERTICAL);
-
 
 	{
-		video_control (add_label_to_sizer (_sizer, this, "Trim frames"));
+		video_control (add_label_to_sizer (grid, _audio_panel, _("Audio Delay")));
 		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-		add_label_to_sizer (s, this, "Start");
-		_dcp_trim_start = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
-		s->Add (_dcp_trim_start);
-		add_label_to_sizer (s, this, "End");
-		_dcp_trim_end = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
-		s->Add (_dcp_trim_end);
+		_audio_delay = new wxSpinCtrl (_audio_panel);
+		s->Add (video_control (_audio_delay), 1);
+		/// TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
+		video_control (add_label_to_sizer (s, _audio_panel, _("ms")));
+		grid->Add (s);
+	}
 
-		_sizer->Add (s);
+	{
+		_use_content_audio = new wxRadioButton (_audio_panel, wxID_ANY, _("Use content's audio"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
+		grid->Add (video_control (_use_content_audio));
+		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+		_audio_stream = new wxChoice (_audio_panel, wxID_ANY);
+		s->Add (video_control (_audio_stream), 1);
+		_audio = new wxStaticText (_audio_panel, wxID_ANY, wxT (""));
+		s->Add (video_control (_audio), 1, wxALIGN_CENTER_VERTICAL | wxLEFT, 8);
+		grid->Add (s, 1, wxEXPAND);
 	}
 
-	_dcp_ab = new wxCheckBox (this, wxID_ANY, wxT ("A/B"));
-	video_control (_dcp_ab);
-	_sizer->Add (_dcp_ab, 1);
-	_sizer->AddSpacer (0);
+	_use_external_audio = new wxRadioButton (_audio_panel, wxID_ANY, _("Use external audio"));
+	grid->Add (_use_external_audio);
+	grid->AddSpacer (0);
 
-	/* STILL-only stuff */
-	{
-		still_control (add_label_to_sizer (_sizer, this, "Duration"));
-		wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-		_still_duration = new wxSpinCtrl (this);
-		still_control (_still_duration);
-		s->Add (_still_duration, 1, wxEXPAND);
-		still_control (add_label_to_sizer (s, this, "s"));
-		_sizer->Add (s);
+	for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
+		add_label_to_sizer (grid, _audio_panel, std_to_wx (audio_channel_name (i)));
+		_external_audio[i] = new wxFilePickerCtrl (_audio_panel, wxID_ANY, wxT (""), _("Select Audio File"), wxT ("*.wav"));
+		grid->Add (_external_audio[i], 1, wxEXPAND);
 	}
 
-	/* Set up our editing widgets */
-	
-	_left_crop->SetRange (0, 1024);
-	_top_crop->SetRange (0, 1024);
-	_right_crop->SetRange (0, 1024);
-	_bottom_crop->SetRange (0, 1024);
 	_audio_gain->SetRange (-60, 60);
 	_audio_delay->SetRange (-1000, 1000);
-	_still_duration->SetRange (0, 60 * 60);
-	_subtitle_offset->SetRange (-1024, 1024);
-	_subtitle_scale->SetRange (1, 1000);
-	_dcp_trim_start->SetRange (0, 100);
-	_dcp_trim_end->SetRange (0, 100);
+}
 
-	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 ()));
-	}
+void
+FilmEditor::make_subtitle_panel ()
+{
+	_subtitle_panel = new wxPanel (_notebook);
+	_subtitle_sizer = new wxBoxSizer (wxVERTICAL);
+	_subtitle_panel->SetSizer (_subtitle_sizer);
+	wxFlexGridSizer* grid = new wxFlexGridSizer (2, 4, 4);
+	_subtitle_sizer->Add (grid, 0, wxALL, 8);
 
-	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()));
-	}
+	_with_subtitles = new wxCheckBox (_subtitle_panel, wxID_ANY, _("With Subtitles"));
+	video_control (_with_subtitles);
+	grid->Add (_with_subtitles, 1);
+	
+	_subtitle_stream = new wxChoice (_subtitle_panel, wxID_ANY);
+	grid->Add (video_control (_subtitle_stream));
 
-	JobManager::instance()->ActiveJobsChanged.connect (
-		bind (&FilmEditor::active_jobs_changed, this, _1)
-		);
+	video_control (add_label_to_sizer (grid, _subtitle_panel, _("Subtitle Offset")));
+	_subtitle_offset = new wxSpinCtrl (_subtitle_panel);
+	grid->Add (video_control (_subtitle_offset), 1);
 
-	/* And set their values from the Film */
-	set_film (f);
-	
-	/* Now connect to them, since initial values are safely set */
-	_name->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (FilmEditor::name_changed), 0, this);
-	_use_dci_name->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (FilmEditor::use_dci_name_toggled), 0, this);
-	_edit_dci_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::edit_dci_button_clicked), 0, this);
-	_format->Connect (wxID_ANY, wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler (FilmEditor::format_changed), 0, this);
-	_content->Connect (wxID_ANY, wxEVT_COMMAND_FILEPICKER_CHANGED, wxCommandEventHandler (FilmEditor::content_changed), 0, this);
-	_left_crop->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::left_crop_changed), 0, this);
-	_right_crop->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::right_crop_changed), 0, this);
-	_top_crop->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::top_crop_changed), 0, this);
-	_bottom_crop->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::bottom_crop_changed), 0, this);
-	_filters_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::edit_filters_clicked), 0, this);
-	_scaler->Connect (wxID_ANY, wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler (FilmEditor::scaler_changed), 0, this);
-	_dcp_content_type->Connect (wxID_ANY, wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler (FilmEditor::dcp_content_type_changed), 0, this);
-	_dcp_ab->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (FilmEditor::dcp_ab_toggled), 0, this);
-	_audio_gain->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::audio_gain_changed), 0, this);
-	_audio_gain_calculate_button->Connect (
-		wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::audio_gain_calculate_button_clicked), 0, this
-		);
-	_audio_delay->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::audio_delay_changed), 0, this);
-	_still_duration->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::still_duration_changed), 0, this);
-	_dcp_trim_start->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::dcp_trim_start_changed), 0, this);
-	_dcp_trim_end->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::dcp_trim_end_changed), 0, this);
-	_with_subtitles->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (FilmEditor::with_subtitles_toggled), 0, this);
-	_subtitle_offset->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::subtitle_offset_changed), 0, this);
-	_subtitle_scale->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::subtitle_scale_changed), 0, this);
-	_audio_stream->Connect (wxID_ANY, wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler (FilmEditor::audio_stream_changed), 0, this);
-	_subtitle_stream->Connect (wxID_ANY, wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler (FilmEditor::subtitle_stream_changed), 0, this);
+	{
+		video_control (add_label_to_sizer (grid, _subtitle_panel, _("Subtitle Scale")));
+		wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+		_subtitle_scale = new wxSpinCtrl (_subtitle_panel);
+		s->Add (video_control (_subtitle_scale));
+		video_control (add_label_to_sizer (s, _subtitle_panel, _("%")));
+		grid->Add (s);
+	}
 
-	setup_visibility ();
-	setup_formats ();
+	_subtitle_offset->SetRange (-1024, 1024);
+	_subtitle_scale->SetRange (1, 1000);
 }
 
 /** Called when the left crop widget has been changed */
@@ -335,10 +484,20 @@ FilmEditor::content_changed (wxCommandEvent &)
 		_film->set_content (wx_to_std (_content->GetPath ()));
 	} catch (std::exception& e) {
 		_content->SetPath (std_to_wx (_film->directory ()));
-		error_dialog (this, String::compose ("Could not set content: %1", e.what ()));
+		error_dialog (this, wxString::Format (_("Could not set content: %s"), e.what ()));
 	}
 }
 
+void
+FilmEditor::trust_content_header_changed (wxCommandEvent &)
+{
+	if (!_film) {
+		return;
+	}
+
+	_film->set_trust_content_header (_trust_content_header->GetValue ());
+}
+
 /** Called when the DCP A/B switch has been toggled */
 void
 FilmEditor::dcp_ab_toggled (wxCommandEvent &)
@@ -381,6 +540,40 @@ FilmEditor::subtitle_scale_changed (wxCommandEvent &)
 	_film->set_subtitle_scale (_subtitle_scale->GetValue() / 100.0);
 }
 
+void
+FilmEditor::colour_lut_changed (wxCommandEvent &)
+{
+	if (!_film) {
+		return;
+	}
+	
+	_film->set_colour_lut (_colour_lut->GetSelection ());
+}
+
+void
+FilmEditor::j2k_bandwidth_changed (wxCommandEvent &)
+{
+	if (!_film) {
+		return;
+	}
+	
+	_film->set_j2k_bandwidth (_j2k_bandwidth->GetValue() * 1e6);
+}
+
+void
+FilmEditor::dcp_frame_rate_changed (wxCommandEvent &)
+{
+	if (!_film) {
+		return;
+	}
+
+	_film->set_dcp_frame_rate (
+		boost::lexical_cast<int> (
+			wx_to_std (_dcp_frame_rate->GetString (_dcp_frame_rate->GetSelection ()))
+			)
+		);
+}
+
 
 /** Called when the metadata stored in the Film object has changed;
  *  so that we can update the GUI.
@@ -407,12 +600,14 @@ FilmEditor::film_changed (Film::Property p)
 		setup_subtitle_control_sensitivity ();
 		setup_streams ();
 		break;
-	case Film::HAS_SUBTITLES:
+	case Film::TRUST_CONTENT_HEADER:
+		checked_set (_trust_content_header, _film->trust_content_header ());
+		break;
+	case Film::SUBTITLE_STREAMS:
 		setup_subtitle_control_sensitivity ();
 		setup_streams ();
 		break;
-	case Film::AUDIO_STREAMS:
-	case Film::SUBTITLE_STREAMS:
+	case Film::CONTENT_AUDIO_STREAMS:
 		setup_streams ();
 		break;
 	case Film::FORMAT:
@@ -423,8 +618,12 @@ FilmEditor::film_changed (Film::Property p)
 			++i;
 			++n;
 		}
-		checked_set (_format, n);
-		_dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
+		if (i == _formats.end()) {
+			checked_set (_format, -1);
+		} else {
+			checked_set (_format, n);
+		}
+		setup_dcp_name ();
 		break;
 	}
 	case Film::CROP:
@@ -442,20 +641,16 @@ FilmEditor::film_changed (Film::Property p)
 			string const b = p.first + " " + p.second;
 			_filters->SetLabel (std_to_wx (b));
 		}
-		_sizer->Layout ();
+		_film_sizer->Layout ();
 		break;
 	}
 	case Film::NAME:
 		checked_set (_name, _film->name());
-		_film->set_dci_date_today ();
-		_dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
+		setup_dcp_name ();
 		break;
-	case Film::FRAMES_PER_SECOND:
-		s << fixed << setprecision(2) << _film->frames_per_second();
-		_frames_per_second->SetLabel (std_to_wx (s.str ()));
-		break;
-	case Film::AUDIO_SAMPLE_RATE:
-		setup_audio_details ();
+	case Film::SOURCE_FRAME_RATE:
+		s << fixed << setprecision(2) << _film->source_frame_rate();
+		_source_frame_rate->SetLabel (std_to_wx (s.str ()));
 		break;
 	case Film::SIZE:
 		if (_film->size().width == 0 && _film->size().height == 0) {
@@ -466,22 +661,22 @@ FilmEditor::film_changed (Film::Property p)
 		}
 		break;
 	case Film::LENGTH:
-		if (_film->frames_per_second() > 0 && _film->length()) {
-			s << _film->length().get() << " frames; " << seconds_to_hms (_film->length().get() / _film->frames_per_second());
+		if (_film->source_frame_rate() > 0 && _film->length()) {
+			s << _film->length().get() << " " << _("frames") << "; " << seconds_to_hms (_film->length().get() / _film->source_frame_rate());
 		} else if (_film->length()) {
-			s << _film->length().get() << " frames";
+			s << _film->length().get() << " " << _("frames");
 		} 
 		_length->SetLabel (std_to_wx (s.str ()));
 		if (_film->length()) {
-			_dcp_trim_start->SetRange (0, _film->length().get());
-			_dcp_trim_end->SetRange (0, _film->length().get());
+			_trim_start->SetRange (0, _film->length().get());
+			_trim_end->SetRange (0, _film->length().get());
 		}
 		break;
+	case Film::DCP_INTRINSIC_DURATION:
+		break;
 	case Film::DCP_CONTENT_TYPE:
 		checked_set (_dcp_content_type, DCPContentType::as_index (_film->dcp_content_type ()));
-		_dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
-		break;
-	case Film::THUMBS:
+		setup_dcp_name ();
 		break;
 	case Film::DCP_AB:
 		checked_set (_dcp_ab, _film->dcp_ab ());
@@ -489,11 +684,11 @@ FilmEditor::film_changed (Film::Property p)
 	case Film::SCALER:
 		checked_set (_scaler, Scaler::as_index (_film->scaler ()));
 		break;
-	case Film::DCP_TRIM_START:
-		checked_set (_dcp_trim_start, _film->dcp_trim_start());
+	case Film::TRIM_START:
+		checked_set (_trim_start, _film->trim_start());
 		break;
-	case Film::DCP_TRIM_END:
-		checked_set (_dcp_trim_end, _film->dcp_trim_end());
+	case Film::TRIM_END:
+		checked_set (_trim_end, _film->trim_end());
 		break;
 	case Film::AUDIO_GAIN:
 		checked_set (_audio_gain, _film->audio_gain ());
@@ -506,9 +701,8 @@ FilmEditor::film_changed (Film::Property p)
 		break;
 	case Film::WITH_SUBTITLES:
 		checked_set (_with_subtitles, _film->with_subtitles ());
-		_subtitle_scale->Enable (_film->with_subtitles ());
-		_subtitle_offset->Enable (_film->with_subtitles ());
-		_dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
+		setup_subtitle_control_sensitivity ();
+		setup_dcp_name ();
 		break;
 	case Film::SUBTITLE_OFFSET:
 		checked_set (_subtitle_offset, _film->subtitle_offset ());
@@ -516,22 +710,59 @@ FilmEditor::film_changed (Film::Property p)
 	case Film::SUBTITLE_SCALE:
 		checked_set (_subtitle_scale, _film->subtitle_scale() * 100);
 		break;
+	case Film::COLOUR_LUT:
+		checked_set (_colour_lut, _film->colour_lut ());
+		break;
+	case Film::J2K_BANDWIDTH:
+		checked_set (_j2k_bandwidth, double (_film->j2k_bandwidth()) / 1e6);
+		break;
 	case Film::USE_DCI_NAME:
 		checked_set (_use_dci_name, _film->use_dci_name ());
-		_dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
+		setup_dcp_name ();
 		break;
 	case Film::DCI_METADATA:
-		_dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
+		setup_dcp_name ();
+		break;
+	case Film::CONTENT_AUDIO_STREAM:
+		if (_film->content_audio_stream()) {
+			checked_set (_audio_stream, _film->content_audio_stream()->to_string());
+		}
+		setup_dcp_name ();
+		setup_audio_details ();
+		setup_audio_control_sensitivity ();
 		break;
-	case Film::AUDIO_STREAM:
-		checked_set (_audio_stream, _film->audio_stream_index ());
-		_dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
+	case Film::USE_CONTENT_AUDIO:
+		checked_set (_use_content_audio, _film->use_content_audio());
+		checked_set (_use_external_audio, !_film->use_content_audio());
+		setup_dcp_name ();
 		setup_audio_details ();
+		setup_audio_control_sensitivity ();
 		break;
 	case Film::SUBTITLE_STREAM:
-		checked_set (_subtitle_stream, _film->subtitle_stream_index ());
+		if (_film->subtitle_stream()) {
+			checked_set (_subtitle_stream, _film->subtitle_stream()->to_string());
+		}
+		break;
+	case Film::EXTERNAL_AUDIO:
+	{
+		vector<string> a = _film->external_audio ();
+		for (size_t i = 0; i < a.size() && i < MAX_AUDIO_CHANNELS; ++i) {
+			checked_set (_external_audio[i], a[i]);
+		}
+		setup_audio_details ();
 		break;
 	}
+	case Film::DCP_FRAME_RATE:
+		for (unsigned int i = 0; i < _dcp_frame_rate->GetCount(); ++i) {
+			if (wx_to_std (_dcp_frame_rate->GetString(i)) == boost::lexical_cast<string> (_film->dcp_frame_rate())) {
+				if (_dcp_frame_rate->GetSelection() != int(i)) {
+					_dcp_frame_rate->SetSelection (i);
+					break;
+				}
+			}
+		}
+		_frame_rate_explanation->SetLabel (std_to_wx (FrameRateConversion (_film->source_frame_rate(), _film->dcp_frame_rate()).explanation));
+	}
 }
 
 /** Called when the format widget has been changed */
@@ -558,7 +789,7 @@ FilmEditor::dcp_content_type_changed (wxCommandEvent &)
 	}
 
 	int const n = _dcp_content_type->GetSelection ();
-	if (n >= 0) {
+	if (n != wxNOT_FOUND) {
 		_film->set_dcp_content_type (DCPContentType::from_index (n));
 	}
 }
@@ -578,32 +809,43 @@ FilmEditor::set_film (shared_ptr<Film> f)
 	if (_film) {
 		FileChanged (_film->directory ());
 	} else {
-		FileChanged ("");
+		FileChanged (wx_to_std (N_("")));
+	}
+
+	if (_audio_dialog) {
+		_audio_dialog->set_film (_film);
 	}
 	
 	film_changed (Film::NAME);
+	film_changed (Film::USE_DCI_NAME);
 	film_changed (Film::CONTENT);
+	film_changed (Film::TRUST_CONTENT_HEADER);
 	film_changed (Film::DCP_CONTENT_TYPE);
 	film_changed (Film::FORMAT);
 	film_changed (Film::CROP);
 	film_changed (Film::FILTERS);
-	film_changed (Film::DCP_TRIM_START);
-	film_changed (Film::DCP_TRIM_END);
-	film_changed (Film::DCP_AB);
-	film_changed (Film::SIZE);
-	film_changed (Film::LENGTH);
-	film_changed (Film::FRAMES_PER_SECOND);
-	film_changed (Film::AUDIO_SAMPLE_RATE);
 	film_changed (Film::SCALER);
+	film_changed (Film::TRIM_START);
+	film_changed (Film::TRIM_END);
+	film_changed (Film::DCP_AB);
+	film_changed (Film::CONTENT_AUDIO_STREAM);
+	film_changed (Film::EXTERNAL_AUDIO);
+	film_changed (Film::USE_CONTENT_AUDIO);
 	film_changed (Film::AUDIO_GAIN);
 	film_changed (Film::AUDIO_DELAY);
 	film_changed (Film::STILL_DURATION);
 	film_changed (Film::WITH_SUBTITLES);
-	film_changed (Film::HAS_SUBTITLES);
 	film_changed (Film::SUBTITLE_OFFSET);
 	film_changed (Film::SUBTITLE_SCALE);
-	film_changed (Film::USE_DCI_NAME);
+	film_changed (Film::COLOUR_LUT);
+	film_changed (Film::J2K_BANDWIDTH);
 	film_changed (Film::DCI_METADATA);
+	film_changed (Film::SIZE);
+	film_changed (Film::LENGTH);
+	film_changed (Film::CONTENT_AUDIO_STREAMS);
+	film_changed (Film::SUBTITLE_STREAMS);
+	film_changed (Film::SOURCE_FRAME_RATE);
+	film_changed (Film::DCP_FRAME_RATE);
 }
 
 /** Updates the sensitivity of lots of widgets to a given value.
@@ -612,11 +854,14 @@ FilmEditor::set_film (shared_ptr<Film> f)
 void
 FilmEditor::set_things_sensitive (bool s)
 {
+	_generally_sensitive = s;
+	
 	_name->Enable (s);
 	_use_dci_name->Enable (s);
 	_edit_dci_button->Enable (s);
 	_format->Enable (s);
 	_content->Enable (s);
+	_trust_content_header->Enable (s);
 	_left_crop->Enable (s);
 	_right_crop->Enable (s);
 	_top_crop->Enable (s);
@@ -625,15 +870,20 @@ FilmEditor::set_things_sensitive (bool s)
 	_scaler->Enable (s);
 	_audio_stream->Enable (s);
 	_dcp_content_type->Enable (s);
-	_dcp_trim_start->Enable (s);
-	_dcp_trim_end->Enable (s);
+	_dcp_frame_rate->Enable (s);
+	_trim_start->Enable (s);
+	_trim_end->Enable (s);
 	_dcp_ab->Enable (s);
+	_colour_lut->Enable (s);
+	_j2k_bandwidth->Enable (s);
 	_audio_gain->Enable (s);
 	_audio_gain_calculate_button->Enable (s);
+	_show_audio->Enable (s);
 	_audio_delay->Enable (s);
 	_still_duration->Enable (s);
 
 	setup_subtitle_control_sensitivity ();
+	setup_audio_control_sensitivity ();
 }
 
 /** Called when the `Edit filters' button has been clicked */
@@ -711,7 +961,19 @@ FilmEditor::setup_visibility ()
 		(*i)->Show (c == STILL);
 	}
 
-	_sizer->Layout ();
+	_notebook->InvalidateBestSize ();
+	
+	_film_sizer->Layout ();
+	_film_sizer->SetSizeHints (_film_panel);
+	_video_sizer->Layout ();
+	_video_sizer->SetSizeHints (_video_panel);
+	_audio_sizer->Layout ();
+	_audio_sizer->SetSizeHints (_audio_panel);
+	_subtitle_sizer->Layout ();
+	_subtitle_sizer->SetSizeHints (_subtitle_panel);
+
+	_notebook->Fit ();
+	Fit ();
 }
 
 void
@@ -725,23 +987,23 @@ FilmEditor::still_duration_changed (wxCommandEvent &)
 }
 
 void
-FilmEditor::dcp_trim_start_changed (wxCommandEvent &)
+FilmEditor::trim_start_changed (wxCommandEvent &)
 {
 	if (!_film) {
 		return;
 	}
 
-	_film->set_dcp_trim_start (_dcp_trim_start->GetValue ());
+	_film->set_trim_start (_trim_start->GetValue ());
 }
 
 void
-FilmEditor::dcp_trim_end_changed (wxCommandEvent &)
+FilmEditor::trim_end_changed (wxCommandEvent &)
 {
 	if (!_film) {
 		return;
 	}
 
-	_film->set_dcp_trim_end (_dcp_trim_end->GetValue ());
+	_film->set_trim_end (_trim_end->GetValue ());
 }
 
 void
@@ -796,7 +1058,7 @@ FilmEditor::setup_formats ()
 		_format->Append (std_to_wx ((*i)->name ()));
 	}
 
-	_sizer->Layout ();
+	_film_sizer->Layout ();
 }
 
 void
@@ -812,11 +1074,36 @@ FilmEditor::with_subtitles_toggled (wxCommandEvent &)
 void
 FilmEditor::setup_subtitle_control_sensitivity ()
 {
-	bool const h = _film ? _film->has_subtitles() : false;
+	bool h = false;
+	if (_generally_sensitive && _film) {
+		h = !_film->subtitle_streams().empty();
+	}
+	
 	_with_subtitles->Enable (h);
-	_subtitle_stream->Enable (h);
-	_subtitle_offset->Enable (h);
-	_subtitle_scale->Enable (h);
+
+	bool j = false;
+	if (_film) {
+		j = _film->with_subtitles ();
+	}
+	
+	_subtitle_stream->Enable (j);
+	_subtitle_offset->Enable (j);
+	_subtitle_scale->Enable (j);
+}
+
+void
+FilmEditor::setup_audio_control_sensitivity ()
+{
+	_use_content_audio->Enable (_generally_sensitive);
+	_use_external_audio->Enable (_generally_sensitive);
+	
+	bool const source = _generally_sensitive && _use_content_audio->GetValue();
+	bool const external = _generally_sensitive && _use_external_audio->GetValue();
+
+	_audio_stream->Enable (source);
+	for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
+		_external_audio[i]->Enable (external);
+	}
 }
 
 void
@@ -836,8 +1123,9 @@ FilmEditor::edit_dci_button_clicked (wxCommandEvent &)
 		return;
 	}
 
-	DCINameDialog* d = new DCINameDialog (this, _film);
+	DCIMetadataDialog* d = new DCIMetadataDialog (this, _film->dci_metadata ());
 	d->ShowModal ();
+	_film->set_dci_metadata (d->dci_metadata ());
 	d->Destroy ();
 }
 
@@ -845,18 +1133,27 @@ void
 FilmEditor::setup_streams ()
 {
 	_audio_stream->Clear ();
-	vector<AudioStream> a = _film->audio_streams ();
-	for (vector<AudioStream>::iterator i = a.begin(); i != a.end(); ++i) {
-		_audio_stream->Append (std_to_wx (i->name()));
+	vector<shared_ptr<AudioStream> > a = _film->content_audio_streams ();
+	for (vector<shared_ptr<AudioStream> >::iterator i = a.begin(); i != a.end(); ++i) {
+		shared_ptr<FFmpegAudioStream> ffa = dynamic_pointer_cast<FFmpegAudioStream> (*i);
+		assert (ffa);
+		_audio_stream->Append (std_to_wx (ffa->name()), new wxStringClientData (std_to_wx (ffa->to_string ())));
+	}
+	
+	if (_film->use_content_audio() && _film->audio_stream()) {
+		checked_set (_audio_stream, _film->audio_stream()->to_string());
 	}
-	_audio_stream->SetSelection (_film->audio_stream_index ());
 
 	_subtitle_stream->Clear ();
-	vector<SubtitleStream> s = _film->subtitle_streams ();
-	for (vector<SubtitleStream>::iterator i = s.begin(); i != s.end(); ++i) {
-		_subtitle_stream->Append (std_to_wx (i->name()));
+	vector<shared_ptr<SubtitleStream> > s = _film->subtitle_streams ();
+	for (vector<shared_ptr<SubtitleStream> >::iterator i = s.begin(); i != s.end(); ++i) {
+		_subtitle_stream->Append (std_to_wx ((*i)->name()), new wxStringClientData (std_to_wx ((*i)->to_string ())));
+	}
+	if (_film->subtitle_stream()) {
+		checked_set (_subtitle_stream, _film->subtitle_stream()->to_string());
+	} else {
+		_subtitle_stream->SetSelection (wxNOT_FOUND);
 	}
-	_subtitle_stream->SetSelection (_film->subtitle_stream_index ());
 }
 
 void
@@ -866,7 +1163,12 @@ FilmEditor::audio_stream_changed (wxCommandEvent &)
 		return;
 	}
 
-	_film->set_audio_stream (_audio_stream->GetSelection ());
+	_film->set_content_audio_stream (
+		audio_stream_factory (
+			string_client_data (_audio_stream->GetClientObject (_audio_stream->GetSelection ())),
+			Film::state_version
+			)
+		);
 }
 
 void
@@ -876,17 +1178,27 @@ FilmEditor::subtitle_stream_changed (wxCommandEvent &)
 		return;
 	}
 
-	_film->set_subtitle_stream (_subtitle_stream->GetSelection ());
+	_film->set_subtitle_stream (
+		subtitle_stream_factory (
+			string_client_data (_subtitle_stream->GetClientObject (_subtitle_stream->GetSelection ())),
+			Film::state_version
+			)
+		);
 }
 
 void
 FilmEditor::setup_audio_details ()
 {
-	if (_film->audio_channels() == 0 && _film->audio_sample_rate() == 0) {
+	if (!_film->audio_stream()) {
 		_audio->SetLabel (wxT (""));
 	} else {
 		stringstream s;
-		s << _film->audio_channels () << " channels, " << _film->audio_sample_rate() << "Hz";
+		if (_film->audio_stream()->channels() == 1) {
+			s << _("1 channel");
+		} else {
+			s << _film->audio_stream()->channels () << " " << _("channels");
+		}
+		s << ", " << _film->audio_stream()->sample_rate() << _("Hz");
 		_audio->SetLabel (std_to_wx (s.str ()));
 	}
 }
@@ -896,3 +1208,55 @@ FilmEditor::active_jobs_changed (bool a)
 {
 	set_things_sensitive (!a);
 }
+
+void
+FilmEditor::use_audio_changed (wxCommandEvent &)
+{
+	_film->set_use_content_audio (_use_content_audio->GetValue());
+}
+
+void
+FilmEditor::external_audio_changed (wxCommandEvent &)
+{
+	vector<string> a;
+	for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
+		a.push_back (wx_to_std (_external_audio[i]->GetPath()));
+	}
+
+	_film->set_external_audio (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::show_audio_clicked (wxCommandEvent &)
+{
+	if (_audio_dialog) {
+		_audio_dialog->Destroy ();
+		_audio_dialog = 0;
+	}
+	
+	_audio_dialog = new AudioDialog (this);
+	_audio_dialog->Show ();
+	_audio_dialog->set_film (_film);
+}
+
+void
+FilmEditor::best_dcp_frame_rate_clicked (wxCommandEvent &)
+{
+	if (!_film) {
+		return;
+	}
+	
+	_film->set_dcp_frame_rate (best_dcp_frame_rate (_film->source_frame_rate ()));
+}