Merge master into direct-mxf.
[dcpomatic.git] / src / wx / film_editor.cc
index 7fd2eb9fcc05b8370413b5159f8c07b716b48f89..f274416fb6225cfa4b3f42fd93b8b06b7e8c1d29 100644 (file)
@@ -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>
 #include "lib/transcode_job.h"
 #include "lib/exceptions.h"
 #include "lib/ab_transcode_job.h"
-#include "lib/thumbs_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 "dcp_range_dialog.h"
 #include "gain_calculator_dialog.h"
 #include "sound_processor.h"
-
-using namespace std;
-using namespace boost;
+#include "dci_metadata_dialog.h"
+#include "scaler.h"
+
+using std::string;
+using std::cout;
+using std::stringstream;
+using std::pair;
+using std::fixed;
+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 (Film* f, wxWindow* parent)
+FilmEditor::FilmEditor (shared_ptr<Film> f, wxWindow* parent)
        : wxPanel (parent)
-       , _ignore_changes (Film::NONE)
        , _film (f)
+       , _generally_sensitive (true)
 {
-       _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 ();
+
+       JobManager::instance()->ActiveJobsChanged.connect (
+               bind (&FilmEditor::active_jobs_changed, this, _1)
+               );
+       
+       setup_visibility ();
+       setup_formats ();
+}
 
-       add_label_to_sizer (_sizer, this, "Name");
-       _name = new wxTextCtrl (this, wxID_ANY);
-       _sizer->Add (_name, 1, wxEXPAND);
+void
+FilmEditor::make_film_panel ()
+{
+       _film_panel = new wxPanel (_notebook);
+       _film_sizer = new wxFlexGridSizer (2, 4, 4);
+       wxBoxSizer* pad = new wxBoxSizer (wxVERTICAL);
+       pad->Add (_film_sizer, 0, wxALL, 8);
+       _film_panel->SetSizer (pad);
+
+       add_label_to_sizer (_film_sizer, _film_panel, "Name");
+       _name = new wxTextCtrl (_film_panel, wxID_ANY);
+       _film_sizer->Add (_name, 1, wxEXPAND);
+
+       add_label_to_sizer (_film_sizer, _film_panel, "DCP Name");
+       _dcp_name = new wxStaticText (_film_panel, wxID_ANY, wxT (""));
+       _film_sizer->Add (_dcp_name, 0, wxALIGN_CENTER_VERTICAL | wxSHRINK);
+
+       _use_dci_name = new wxCheckBox (_film_panel, wxID_ANY, wxT ("Use DCI name"));
+       _film_sizer->Add (_use_dci_name, 1, wxEXPAND);
+       _edit_dci_button = new wxButton (_film_panel, wxID_ANY, wxT ("Details..."));
+       _film_sizer->Add (_edit_dci_button, 0);
+
+       add_label_to_sizer (_film_sizer, _film_panel, "Content");
+       _content = new wxFilePickerCtrl (_film_panel, wxID_ANY, wxT (""), wxT ("Select Content File"), wxT("*.*"));
+       _film_sizer->Add (_content, 1, wxEXPAND);
+
+       _trust_content_header = new wxCheckBox (_film_panel, wxID_ANY, wxT ("Trust content's header"));
+       video_control (_trust_content_header);
+       _film_sizer->Add (_trust_content_header, 1);
+       _film_sizer->AddSpacer (0);
+
+       add_label_to_sizer (_film_sizer, _film_panel, "Content Type");
+       _dcp_content_type = new wxChoice (_film_panel, wxID_ANY);
+       _film_sizer->Add (_dcp_content_type);
+
+       video_control (add_label_to_sizer (_film_sizer, _film_panel, "Frames Per Second"));
+       _frames_per_second = new wxStaticText (_film_panel, wxID_ANY, wxT (""));
+       _film_sizer->Add (video_control (_frames_per_second), 1, wxALIGN_CENTER_VERTICAL);
+       
+       video_control (add_label_to_sizer (_film_sizer, _film_panel, "Original Size"));
+       _original_size = new wxStaticText (_film_panel, wxID_ANY, wxT (""));
+       _film_sizer->Add (video_control (_original_size), 1, wxALIGN_CENTER_VERTICAL);
+       
+       video_control (add_label_to_sizer (_film_sizer, _film_panel, "Length"));
+       _length = new wxStaticText (_film_panel, wxID_ANY, wxT (""));
+       _film_sizer->Add (video_control (_length), 1, wxALIGN_CENTER_VERTICAL);
 
-       _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 ("Edit..."));
-       _sizer->Add (_edit_dci_button, 0);
 
-       add_label_to_sizer (_sizer, this, "Content");
-       _content = new wxFilePickerCtrl (this, wxID_ANY, wxT (""), wxT ("Select Content File"), wxT("*.*"));
-       _sizer->Add (_content, 1, wxEXPAND);
+       {
+               video_control (add_label_to_sizer (_film_sizer, _film_panel, "Trim frames"));
+               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));
+
+               _film_sizer->Add (s);
+       }
+
+       _dcp_ab = new wxCheckBox (_film_panel, wxID_ANY, wxT ("A/B"));
+       video_control (_dcp_ab);
+       _film_sizer->Add (_dcp_ab, 1);
+       _film_sizer->AddSpacer (0);
 
-       add_label_to_sizer (_sizer, this, "Content Type");
-       _dcp_content_type = new wxComboBox (this, wxID_ANY);
-       _sizer->Add (_dcp_content_type);
+       /* STILL-only stuff */
+       {
+               still_control (add_label_to_sizer (_film_sizer, _film_panel, "Duration"));
+               wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+               _still_duration = new wxSpinCtrl (_film_panel);
+               still_control (_still_duration);
+               s->Add (_still_duration, 1, wxEXPAND);
+               still_control (add_label_to_sizer (s, _film_panel, "s"));
+               _film_sizer->Add (s);
+       }
 
-       add_label_to_sizer (_sizer, this, "Format");
-       _format = new wxComboBox (this, wxID_ANY);
-       _sizer->Add (_format);
+       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::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_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
+               );
+       _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 wxFlexGridSizer (2, 4, 4);
+       wxBoxSizer* pad = new wxBoxSizer (wxVERTICAL);
+       pad->Add (_video_sizer, 0, wxALL, 8);
+       _video_panel->SetSizer (pad);
+
+       add_label_to_sizer (_video_sizer, _video_panel, "Format");
+       _format = new wxChoice (_video_panel, wxID_ANY);
+       _video_sizer->Add (_format);
 
        {
-               add_label_to_sizer (_sizer, this, "Crop");
+               add_label_to_sizer (_video_sizer, _video_panel, "Crop");
                wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
 
-               add_label_to_sizer (s, this, "L");
-               _left_crop = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
+               add_label_to_sizer (s, _video_panel, "L");
+               _left_crop = new wxSpinCtrl (_video_panel, 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));
+               add_label_to_sizer (s, _video_panel, "R");
+               _right_crop = new wxSpinCtrl (_video_panel, 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));
+               add_label_to_sizer (s, _video_panel, "T");
+               _top_crop = new wxSpinCtrl (_video_panel, 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));
+               add_label_to_sizer (s, _video_panel, "B");
+               _bottom_crop = new wxSpinCtrl (_video_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1));
                s->Add (_bottom_crop, 0);
 
-               _sizer->Add (s);
+               _video_sizer->Add (s);
        }
 
        /* VIDEO-only stuff */
        {
-               video_control (add_label_to_sizer (_sizer, this, "Filters"));
+               video_control (add_label_to_sizer (_video_sizer, _video_panel, "Filters"));
                wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-               _filters = new wxStaticText (this, wxID_ANY, wxT ("None"));
+               _filters = new wxStaticText (_video_panel, wxID_ANY, wxT ("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, wxT ("Edit..."));
                video_control (_filters_button);
                s->Add (_filters_button, 0);
-               _sizer->Add (s, 1);
+               _video_sizer->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 (_video_sizer, _video_panel, "Scaler"));
+       _scaler = new wxChoice (_video_panel, wxID_ANY);
+       _video_sizer->Add (video_control (_scaler), 1);
+
+       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()));
+       }
+
+       add_label_to_sizer (_video_sizer, _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);
+       _video_sizer->Add (_colour_lut, 1, wxEXPAND);
+
+       {
+               add_label_to_sizer (_video_sizer, _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");
+               _video_sizer->Add (s, 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 wxFlexGridSizer (2, 4, 4);
+       wxBoxSizer* pad = new wxBoxSizer (wxVERTICAL);
+       pad->Add (_audio_sizer, 0, wxALL, 8);
+       _audio_panel->SetSizer (pad);
 
        {
-               video_control (add_label_to_sizer (_sizer, this, "Audio Gain"));
+               video_control (add_label_to_sizer (_audio_sizer, _audio_panel, "Audio Gain"));
                wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-               _audio_gain = new wxSpinCtrl (this);
+               _audio_gain = new wxSpinCtrl (_audio_panel);
                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 (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);
-               _sizer->Add (s);
+               _audio_sizer->Add (s);
        }
 
        {
-               video_control (add_label_to_sizer (_sizer, this, "Audio Delay"));
+               video_control (add_label_to_sizer (_audio_sizer, _audio_panel, "Audio Delay"));
                wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-               _audio_delay = new wxSpinCtrl (this);
+               _audio_delay = new wxSpinCtrl (_audio_panel);
                s->Add (video_control (_audio_delay), 1);
-               video_control (add_label_to_sizer (s, this, "ms"));
-               _sizer->Add (s);
+               video_control (add_label_to_sizer (s, _audio_panel, "ms"));
+               _audio_sizer->Add (s);
        }
 
-       _with_subtitles = new wxCheckBox (this, wxID_ANY, wxT("With Subtitles"));
-       video_control (_with_subtitles);
-       _sizer->Add (_with_subtitles, 1);
-       _sizer->AddSpacer (0);
-
-       video_control (add_label_to_sizer (_sizer, this, "Subtitle Offset"));
-       _subtitle_offset = new wxSpinCtrl (this);
-       _sizer->Add (video_control (_subtitle_offset), 1);
-
        {
-               video_control (add_label_to_sizer (_sizer, this, "Subtitle Scale"));
+               _use_content_audio = new wxRadioButton (_audio_panel, wxID_ANY, _("Use content's audio"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
+               _audio_sizer->Add (video_control (_use_content_audio));
                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_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);
+               _audio_sizer->Add (s, 1, wxEXPAND);
        }
-       
-       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, "Audio"));
-       _audio = new wxStaticText (this, wxID_ANY, wxT (""));
-       _sizer->Add (video_control (_audio), 1, wxALIGN_CENTER_VERTICAL);
 
-       {
-               video_control (add_label_to_sizer (_sizer, this, "Range"));
-               wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-               _dcp_range = new wxStaticText (this, wxID_ANY, wxT (""));
-               s->Add (video_control (_dcp_range), 1, wxALIGN_CENTER_VERTICAL | wxTOP | wxBOTTOM | wxRIGHT, 6);
-               _change_dcp_range_button = new wxButton (this, wxID_ANY, wxT ("Edit..."));
-               s->Add (video_control (_change_dcp_range_button), 0, 0, 6);
-               _sizer->Add (s);
+       _use_external_audio = new wxRadioButton (_audio_panel, wxID_ANY, _("Use external audio"));
+       _audio_sizer->Add (_use_external_audio);
+       _audio_sizer->AddSpacer (0);
+
+       assert (MAX_AUDIO_CHANNELS == 6);
+
+       char const * channels[] = {
+               "Left",
+               "Right",
+               "Centre",
+               "Lfe (sub)",
+               "Left surround",
+               "Right surround"
+       };
+
+       for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) {
+               add_label_to_sizer (_audio_sizer, _audio_panel, channels[i]);
+               _external_audio[i] = new wxFilePickerCtrl (_audio_panel, wxID_ANY, wxT (""), wxT ("Select Audio File"), wxT ("*.wav"));
+               _audio_sizer->Add (_external_audio[i], 1, wxEXPAND);
        }
 
-       _dcp_ab = new wxCheckBox (this, wxID_ANY, wxT ("A/B"));
-       video_control (_dcp_ab);
-       _sizer->Add (_dcp_ab, 1);
-       _sizer->AddSpacer (0);
+       _audio_gain->SetRange (-60, 60);
+       _audio_delay->SetRange (-1000, 1000);
+}
 
-       /* 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);
-       }
+void
+FilmEditor::make_subtitle_panel ()
+{
+       _subtitle_panel = new wxPanel (_notebook);
+       _subtitle_sizer = new wxFlexGridSizer (2, 4, 4);
+       wxBoxSizer* pad = new wxBoxSizer (wxVERTICAL);
+       pad->Add (_subtitle_sizer, 0, wxALL, 8);
+       _subtitle_panel->SetSizer (pad);
 
-       /* Set up our editing widgets */
+       _with_subtitles = new wxCheckBox (_subtitle_panel, wxID_ANY, wxT("With Subtitles"));
+       video_control (_with_subtitles);
+       _subtitle_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);
-       _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);
+       _subtitle_stream = new wxChoice (_subtitle_panel, wxID_ANY);
+       _subtitle_sizer->Add (video_control (_subtitle_stream));
 
-       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 ()));
-       }
+       video_control (add_label_to_sizer (_subtitle_sizer, _subtitle_panel, "Subtitle Offset"));
+       _subtitle_offset = new wxSpinCtrl (_subtitle_panel);
+       _subtitle_sizer->Add (video_control (_subtitle_offset), 1);
 
-       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 (_subtitle_sizer, _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, "%"));
+               _subtitle_sizer->Add (s);
        }
 
-       /* 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);
-       _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);
-       _change_dcp_range_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::change_dcp_range_clicked), 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);
-
-       setup_visibility ();
-       setup_formats ();
+       _subtitle_offset->SetRange (-1024, 1024);
+       _subtitle_scale->SetRange (1, 1000);
 }
 
 /** Called when the left crop widget has been changed */
@@ -255,9 +401,7 @@ FilmEditor::left_crop_changed (wxCommandEvent &)
                return;
        }
 
-       _ignore_changes = Film::CROP;
        _film->set_left_crop (_left_crop->GetValue ());
-       _ignore_changes = Film::NONE;
 }
 
 /** Called when the right crop widget has been changed */
@@ -268,9 +412,7 @@ FilmEditor::right_crop_changed (wxCommandEvent &)
                return;
        }
 
-       _ignore_changes = Film::CROP;
        _film->set_right_crop (_right_crop->GetValue ());
-       _ignore_changes = Film::NONE;
 }
 
 /** Called when the top crop widget has been changed */
@@ -281,9 +423,7 @@ FilmEditor::top_crop_changed (wxCommandEvent &)
                return;
        }
 
-       _ignore_changes = Film::CROP;
        _film->set_top_crop (_top_crop->GetValue ());
-       _ignore_changes = Film::NONE;
 }
 
 /** Called when the bottom crop value has been changed */
@@ -294,9 +434,7 @@ FilmEditor::bottom_crop_changed (wxCommandEvent &)
                return;
        }
 
-       _ignore_changes = Film::CROP;
        _film->set_bottom_crop (_bottom_crop->GetValue ());
-       _ignore_changes = Film::NONE;
 }
 
 /** Called when the content filename has been changed */
@@ -307,20 +445,22 @@ FilmEditor::content_changed (wxCommandEvent &)
                return;
        }
 
-       _ignore_changes = Film::CONTENT;
-       
        try {
                _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 ()));
        }
+}
 
-       _ignore_changes = Film::NONE;
+void
+FilmEditor::trust_content_header_changed (wxCommandEvent &)
+{
+       if (!_film) {
+               return;
+       }
 
-       setup_visibility ();
-       setup_formats ();
-       setup_subtitle_button ();
+       _film->set_trust_content_header (_trust_content_header->GetValue ());
 }
 
 /** Called when the DCP A/B switch has been toggled */
@@ -331,9 +471,7 @@ FilmEditor::dcp_ab_toggled (wxCommandEvent &)
                return;
        }
        
-       _ignore_changes = Film::DCP_AB;
        _film->set_dcp_ab (_dcp_ab->GetValue ());
-       _ignore_changes = Film::NONE;
 }
 
 /** Called when the name widget has been changed */
@@ -344,9 +482,7 @@ FilmEditor::name_changed (wxCommandEvent &)
                return;
        }
 
-       _ignore_changes = Film::NAME;
        _film->set_name (string (_name->GetValue().mb_str()));
-       _ignore_changes = Film::NONE;
 }
 
 void
@@ -356,9 +492,7 @@ FilmEditor::subtitle_offset_changed (wxCommandEvent &)
                return;
        }
 
-       _ignore_changes = Film::SUBTITLE_OFFSET;
        _film->set_subtitle_offset (_subtitle_offset->GetValue ());
-       _ignore_changes = Film::NONE;
 }
 
 void
@@ -368,11 +502,29 @@ FilmEditor::subtitle_scale_changed (wxCommandEvent &)
                return;
        }
 
-       _ignore_changes = Film::SUBTITLE_OFFSET;
        _film->set_subtitle_scale (_subtitle_scale->GetValue() / 100.0);
-       _ignore_changes = Film::NONE;
 }
 
+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);
+}      
+
 
 /** Called when the metadata stored in the Film object has changed;
  *  so that we can update the GUI.
@@ -381,7 +533,9 @@ FilmEditor::subtitle_scale_changed (wxCommandEvent &)
 void
 FilmEditor::film_changed (Film::Property p)
 {
-       if (!_film || _ignore_changes == p) {
+       ensure_ui_thread ();
+       
+       if (!_film) {
                return;
        }
 
@@ -391,10 +545,21 @@ FilmEditor::film_changed (Film::Property p)
        case Film::NONE:
                break;
        case Film::CONTENT:
-               _content->SetPath (std_to_wx (_film->content ()));
+               checked_set (_content, _film->content ());
                setup_visibility ();
                setup_formats ();
-               setup_subtitle_button ();
+               setup_subtitle_control_sensitivity ();
+               setup_streams ();
+               break;
+       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::CONTENT_AUDIO_STREAMS:
+               setup_streams ();
                break;
        case Film::FORMAT:
        {
@@ -404,14 +569,19 @@ FilmEditor::film_changed (Film::Property p)
                        ++i;
                        ++n;
                }
-               _format->SetSelection (n);
+               if (i == _formats.end()) {
+                       checked_set (_format, -1);
+               } else {
+                       checked_set (_format, n);
+               }
+               _dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
                break;
        }
        case Film::CROP:
-               _left_crop->SetValue (_film->crop().left);
-               _right_crop->SetValue (_film->crop().right);
-               _top_crop->SetValue (_film->crop().top);
-               _bottom_crop->SetValue (_film->crop().bottom);
+               checked_set (_left_crop, _film->crop().left);
+               checked_set (_right_crop, _film->crop().right);
+               checked_set (_top_crop, _film->crop().top);
+               checked_set (_bottom_crop, _film->crop().bottom);
                break;
        case Film::FILTERS:
        {
@@ -422,28 +592,18 @@ 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:
-               _name->ChangeValue (std_to_wx (_film->name ()));
+               checked_set (_name, _film->name());
+               _film->set_dci_date_today ();
+               _dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
                break;
        case Film::FRAMES_PER_SECOND:
-       {
-               stringstream s;
                s << fixed << setprecision(2) << _film->frames_per_second();
                _frames_per_second->SetLabel (std_to_wx (s.str ()));
                break;
-       }
-       case Film::AUDIO_CHANNELS:
-       case Film::AUDIO_SAMPLE_RATE:
-               if (_film->audio_channels() == 0 && _film->audio_sample_rate() == 0) {
-                       _audio->SetLabel (wxT (""));
-               } else {
-                       s << _film->audio_channels () << " channels, " << _film->audio_sample_rate() << "Hz";
-                       _audio->SetLabel (std_to_wx (s.str ()));
-               }
-               break;
        case Film::SIZE:
                if (_film->size().width == 0 && _film->size().height == 0) {
                        _original_size->SetLabel (wxT (""));
@@ -453,56 +613,97 @@ FilmEditor::film_changed (Film::Property p)
                }
                break;
        case Film::LENGTH:
-               if (_film->frames_per_second() > 0 && _film->length() > 0) {
-                       s << _film->length() << " frames; " << seconds_to_hms (_film->length() / _film->frames_per_second());
-               } else if (_film->length() > 0) {
-                       s << _film->length() << " frames";
+               if (_film->frames_per_second() > 0 && _film->length()) {
+                       s << _film->length().get() << " frames; " << seconds_to_hms (_film->length().get() / _film->frames_per_second());
+               } else if (_film->length()) {
+                       s << _film->length().get() << " frames";
                } 
                _length->SetLabel (std_to_wx (s.str ()));
-               break;
-       case Film::DCP_CONTENT_TYPE:
-               _dcp_content_type->SetSelection (DCPContentType::as_index (_film->dcp_content_type ()));
-               break;
-       case Film::THUMBS:
-               break;
-       case Film::DCP_FRAMES:
-               if (_film->dcp_frames() == 0) {
-                       _dcp_range->SetLabel (wxT ("Whole film"));
-               } else {
-                       stringstream s;
-                       s << "First " << _film->dcp_frames() << " frames";
-                       _dcp_range->SetLabel (std_to_wx (s.str ()));
+               if (_film->length()) {
+                       _trim_start->SetRange (0, _film->length().get());
+                       _trim_end->SetRange (0, _film->length().get());
                }
-               _sizer->Layout ();
                break;
-       case Film::DCP_TRIM_ACTION:
+       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::DCP_AB:
-               _dcp_ab->SetValue (_film->dcp_ab ());
+               checked_set (_dcp_ab, _film->dcp_ab ());
                break;
        case Film::SCALER:
-               _scaler->SetSelection (Scaler::as_index (_film->scaler ()));
+               checked_set (_scaler, Scaler::as_index (_film->scaler ()));
+               break;
+       case Film::TRIM_START:
+               checked_set (_trim_start, _film->trim_start());
+               break;
+       case Film::TRIM_END:
+               checked_set (_trim_end, _film->trim_end());
                break;
        case Film::AUDIO_GAIN:
-               _audio_gain->SetValue (_film->audio_gain ());
+               checked_set (_audio_gain, _film->audio_gain ());
                break;
        case Film::AUDIO_DELAY:
-               _audio_delay->SetValue (_film->audio_delay ());
+               checked_set (_audio_delay, _film->audio_delay ());
                break;
        case Film::STILL_DURATION:
-               _still_duration->SetValue (_film->still_duration ());
+               checked_set (_still_duration, _film->still_duration ());
                break;
        case Film::WITH_SUBTITLES:
-               _with_subtitles->SetValue (_film->with_subtitles ());
-               _subtitle_scale->Enable (_film->with_subtitles ());
-               _subtitle_offset->Enable (_film->with_subtitles ());
+               checked_set (_with_subtitles, _film->with_subtitles ());
+               setup_subtitle_control_sensitivity ();
+               _dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
                break;
        case Film::SUBTITLE_OFFSET:
-               _subtitle_offset->SetValue (_film->subtitle_offset ());
+               checked_set (_subtitle_offset, _film->subtitle_offset ());
                break;
        case Film::SUBTITLE_SCALE:
-               _subtitle_scale->SetValue (_film->subtitle_scale() * 100);
+               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 ()));
+               break;
+       case Film::DCI_METADATA:
+               _dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
+               break;
+       case Film::CONTENT_AUDIO_STREAM:
+               if (_film->content_audio_stream()) {
+                       checked_set (_audio_stream, _film->content_audio_stream()->to_string());
+               }
+               _dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
+               setup_audio_details ();
+               setup_audio_control_sensitivity ();
+               break;
+       case Film::USE_CONTENT_AUDIO:
+               checked_set (_use_content_audio, _film->use_content_audio());
+               checked_set (_use_external_audio, !_film->use_content_audio());
+               _dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
+               setup_audio_details ();
+               setup_audio_control_sensitivity ();
+               break;
+       case Film::SUBTITLE_STREAM:
+               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;
+       }
        }
 }
 
@@ -514,13 +715,11 @@ FilmEditor::format_changed (wxCommandEvent &)
                return;
        }
 
-       _ignore_changes = Film::FORMAT;
        int const n = _format->GetSelection ();
        if (n >= 0) {
                assert (n < int (_formats.size()));
                _film->set_format (_formats[n]);
        }
-       _ignore_changes = Film::NONE;
 }
 
 /** Called when the DCP content type widget has been changed */
@@ -531,24 +730,22 @@ FilmEditor::dcp_content_type_changed (wxCommandEvent &)
                return;
        }
 
-       _ignore_changes = Film::DCP_CONTENT_TYPE;
        int const n = _dcp_content_type->GetSelection ();
-       if (n >= 0) {
+       if (n != wxNOT_FOUND) {
                _film->set_dcp_content_type (DCPContentType::from_index (n));
        }
-       _ignore_changes = Film::NONE;
 }
 
 /** Sets the Film that we are editing */
 void
-FilmEditor::set_film (Film* f)
+FilmEditor::set_film (shared_ptr<Film> f)
 {
        _film = f;
 
        set_things_sensitive (_film != 0);
 
        if (_film) {
-               _film->Changed.connect (sigc::mem_fun (*this, &FilmEditor::film_changed));
+               _film->Changed.connect (bind (&FilmEditor::film_changed, this, _1));
        }
 
        if (_film) {
@@ -558,26 +755,34 @@ FilmEditor::set_film (Film* f)
        }
        
        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_FRAMES);
-       film_changed (Film::DCP_TRIM_ACTION);
-       film_changed (Film::DCP_AB);
-       film_changed (Film::SIZE);
-       film_changed (Film::LENGTH);
-       film_changed (Film::FRAMES_PER_SECOND);
-       film_changed (Film::AUDIO_CHANNELS);
-       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::SUBTITLE_OFFSET);
        film_changed (Film::SUBTITLE_SCALE);
+       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::FRAMES_PER_SECOND);
 }
 
 /** Updates the sensitivity of lots of widgets to a given value.
@@ -586,35 +791,42 @@ FilmEditor::set_film (Film* f)
 void
 FilmEditor::set_things_sensitive (bool s)
 {
+       _generally_sensitive = s;
+       
        _name->Enable (s);
-       _frames_per_second->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);
        _bottom_crop->Enable (s);
        _filters_button->Enable (s);
        _scaler->Enable (s);
+       _audio_stream->Enable (s);
        _dcp_content_type->Enable (s);
-       _dcp_range->Enable (s);
-       _change_dcp_range_button->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);
        _audio_delay->Enable (s);
        _still_duration->Enable (s);
-       _with_subtitles->Enable (s);
-       _subtitle_offset->Enable (s);
-       _subtitle_scale->Enable (s);
+
+       setup_subtitle_control_sensitivity ();
+       setup_audio_control_sensitivity ();
 }
 
 /** Called when the `Edit filters' button has been clicked */
 void
 FilmEditor::edit_filters_clicked (wxCommandEvent &)
 {
-       FilterDialog* d = new FilterDialog (this, _film->filters ());
-       d->ActiveChanged.connect (sigc::mem_fun (*_film, &Film::set_filters));
+       FilterDialog* d = new FilterDialog (this, _film->filters());
+       d->ActiveChanged.connect (bind (&Film::set_filters, _film, _1));
        d->ShowModal ();
        d->Destroy ();
 }
@@ -627,12 +839,10 @@ FilmEditor::scaler_changed (wxCommandEvent &)
                return;
        }
 
-       _ignore_changes = Film::SCALER;
        int const n = _scaler->GetSelection ();
        if (n >= 0) {
                _film->set_scaler (Scaler::from_index (n));
        }
-       _ignore_changes = Film::NONE;
 }
 
 void
@@ -642,9 +852,7 @@ FilmEditor::audio_gain_changed (wxCommandEvent &)
                return;
        }
 
-       _ignore_changes = Film::AUDIO_GAIN;
        _film->set_audio_gain (_audio_gain->GetValue ());
-       _ignore_changes = Film::NONE;
 }
 
 void
@@ -654,9 +862,7 @@ FilmEditor::audio_delay_changed (wxCommandEvent &)
                return;
        }
 
-       _ignore_changes = Film::AUDIO_DELAY;
        _film->set_audio_delay (_audio_delay->GetValue ());
-       _ignore_changes = Film::NONE;
 }
 
 wxControl *
@@ -690,7 +896,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
@@ -700,24 +918,27 @@ FilmEditor::still_duration_changed (wxCommandEvent &)
                return;
        }
 
-       _ignore_changes = Film::STILL_DURATION;
        _film->set_still_duration (_still_duration->GetValue ());
-       _ignore_changes = Film::NONE;
 }
 
 void
-FilmEditor::change_dcp_range_clicked (wxCommandEvent &)
+FilmEditor::trim_start_changed (wxCommandEvent &)
 {
-       DCPRangeDialog* d = new DCPRangeDialog (this, _film);
-       d->Changed.connect (sigc::mem_fun (*this, &FilmEditor::dcp_range_changed));
-       d->ShowModal ();
+       if (!_film) {
+               return;
+       }
+
+       _film->set_trim_start (_trim_start->GetValue ());
 }
 
 void
-FilmEditor::dcp_range_changed (int frames, TrimAction action)
+FilmEditor::trim_end_changed (wxCommandEvent &)
 {
-       _film->set_dcp_frames (frames);
-       _film->set_dcp_trim_action (action);
+       if (!_film) {
+               return;
+       }
+
+       _film->set_trim_end (_trim_end->GetValue ());
 }
 
 void
@@ -772,7 +993,7 @@ FilmEditor::setup_formats ()
                _format->Append (std_to_wx ((*i)->name ()));
        }
 
-       _sizer->Layout ();
+       _film_sizer->Layout ();
 }
 
 void
@@ -782,20 +1003,160 @@ FilmEditor::with_subtitles_toggled (wxCommandEvent &)
                return;
        }
 
-       _ignore_changes = Film::WITH_SUBTITLES;
        _film->set_with_subtitles (_with_subtitles->GetValue ());
-       _ignore_changes = Film::NONE;
+}
 
-       _subtitle_scale->Enable (_film->with_subtitles ());
-       _subtitle_offset->Enable (_film->with_subtitles ());
+void
+FilmEditor::setup_subtitle_control_sensitivity ()
+{
+       bool h = false;
+       if (_generally_sensitive && _film) {
+               h = !_film->subtitle_streams().empty();
+       }
+       
+       _with_subtitles->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
+FilmEditor::use_dci_name_toggled (wxCommandEvent &)
+{
+       if (!_film) {
+               return;
+       }
+
+       _film->set_use_dci_name (_use_dci_name->GetValue ());
+}
+
+void
+FilmEditor::edit_dci_button_clicked (wxCommandEvent &)
+{
+       if (!_film) {
+               return;
+       }
+
+       DCIMetadataDialog* d = new DCIMetadataDialog (this, _film->dci_metadata ());
+       d->ShowModal ();
+       _film->set_dci_metadata (d->dci_metadata ());
+       d->Destroy ();
+}
+
+void
+FilmEditor::setup_streams ()
+{
+       _audio_stream->Clear ();
+       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());
+       }
+
+       _subtitle_stream->Clear ();
+       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);
+       }
 }
 
 void
-FilmEditor::setup_subtitle_button ()
+FilmEditor::audio_stream_changed (wxCommandEvent &)
 {
-       _with_subtitles->Enable (_film->has_subtitles ());
-       if (!_film->has_subtitles ()) {
-               _with_subtitles->SetValue (false);
+       if (!_film) {
+               return;
        }
+
+       _film->set_content_audio_stream (
+               audio_stream_factory (
+                       string_client_data (_audio_stream->GetClientObject (_audio_stream->GetSelection ())),
+                       Film::state_version
+                       )
+               );
 }
 
+void
+FilmEditor::subtitle_stream_changed (wxCommandEvent &)
+{
+       if (!_film) {
+               return;
+       }
+
+       _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_stream()) {
+               _audio->SetLabel (wxT (""));
+       } else {
+               stringstream s;
+               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 ()));
+       }
+}
+
+void
+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);
+}