Remove film player, DVD ripping, alignment, screen configs; never finished and not...
[dcpomatic.git] / src / wx / film_editor.cc
index bc7414c41325603babaa2c72f9cd462ff68e177c..67cd17d4ada9449a91acee724ef52aeae1871cbe 100644 (file)
 #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 "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_name_dialog.h"
+#include "scaler.h"
+
+using std::string;
+using std::stringstream;
+using std::pair;
+using std::fixed;
+using std::setprecision;
+using std::list;
+using std::vector;
+using boost::shared_ptr;
 
 /** @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);
@@ -60,6 +65,15 @@ FilmEditor::FilmEditor (Film* f, wxWindow* parent)
        _name = new wxTextCtrl (this, wxID_ANY);
        _sizer->Add (_name, 1, wxEXPAND);
 
+       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);
+
+       _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);
+
        add_label_to_sizer (_sizer, this, "Content");
        _content = new wxFilePickerCtrl (this, wxID_ANY, wxT (""), wxT ("Select Content File"), wxT("*.*"));
        _sizer->Add (_content, 1, wxEXPAND);
@@ -109,6 +123,16 @@ FilmEditor::FilmEditor (Film* f, wxWindow* parent)
        _scaler = new wxComboBox (this, wxID_ANY);
        _sizer->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);
+       }
+
        {
                video_control (add_label_to_sizer (_sizer, this, "Audio Gain"));
                wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
@@ -133,8 +157,23 @@ FilmEditor::FilmEditor (Film* f, wxWindow* parent)
        _with_subtitles = new wxCheckBox (this, wxID_ANY, wxT("With Subtitles"));
        video_control (_with_subtitles);
        _sizer->Add (_with_subtitles, 1);
-       _sizer->AddSpacer (0);
+       
+       _subtitle_stream = new wxComboBox (this, wxID_ANY);
+       _sizer->Add (_subtitle_stream);
+
+       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"));
+               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);
+       }
+       
        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);
@@ -147,17 +186,17 @@ FilmEditor::FilmEditor (Film* f, wxWindow* parent)
        _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"));
+               video_control (add_label_to_sizer (_sizer, this, "Trim frames"));
                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);
+               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);
+
                _sizer->Add (s);
        }
 
@@ -186,6 +225,10 @@ FilmEditor::FilmEditor (Film* f, wxWindow* parent)
        _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) {
@@ -197,11 +240,17 @@ FilmEditor::FilmEditor (Film* f, wxWindow* parent)
                _scaler->Append (std_to_wx ((*i)->name()));
        }
 
+       JobManager::instance()->ActiveJobsChanged.connect (
+               bind (&FilmEditor::active_jobs_changed, this, _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);
@@ -218,7 +267,13 @@ FilmEditor::FilmEditor (Film* f, wxWindow* parent)
                );
        _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);
+       _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);
 
        setup_visibility ();
        setup_formats ();
@@ -232,9 +287,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 */
@@ -245,9 +298,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 */
@@ -258,9 +309,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 */
@@ -271,9 +320,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 */
@@ -284,20 +331,12 @@ 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;
-
-       setup_visibility ();
-       setup_formats ();
-       setup_subtitle_button ();
 }
 
 /** Called when the DCP A/B switch has been toggled */
@@ -308,9 +347,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 */
@@ -321,11 +358,30 @@ FilmEditor::name_changed (wxCommandEvent &)
                return;
        }
 
-       _ignore_changes = Film::NAME;
        _film->set_name (string (_name->GetValue().mb_str()));
-       _ignore_changes = Film::NONE;
 }
 
+void
+FilmEditor::subtitle_offset_changed (wxCommandEvent &)
+{
+       if (!_film) {
+               return;
+       }
+
+       _film->set_subtitle_offset (_subtitle_offset->GetValue ());
+}
+
+void
+FilmEditor::subtitle_scale_changed (wxCommandEvent &)
+{
+       if (!_film) {
+               return;
+       }
+
+       _film->set_subtitle_scale (_subtitle_scale->GetValue() / 100.0);
+}
+
+
 /** Called when the metadata stored in the Film object has changed;
  *  so that we can update the GUI.
  *  @param p Property of the Film that has changed.
@@ -333,7 +389,9 @@ FilmEditor::name_changed (wxCommandEvent &)
 void
 FilmEditor::film_changed (Film::Property p)
 {
-       if (!_film || _ignore_changes == p) {
+       ensure_ui_thread ();
+       
+       if (!_film) {
                return;
        }
 
@@ -343,10 +401,19 @@ 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::HAS_SUBTITLES:
+               setup_subtitle_control_sensitivity ();
+               setup_streams ();
+               break;
+       case Film::AUDIO_STREAMS:
+       case Film::SUBTITLE_STREAMS:
+               setup_streams ();
                break;
        case Film::FORMAT:
        {
@@ -356,14 +423,15 @@ FilmEditor::film_changed (Film::Property p)
                        ++i;
                        ++n;
                }
-               _format->SetSelection (n);
+               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:
        {
@@ -378,23 +446,16 @@ FilmEditor::film_changed (Film::Property p)
                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 ()));
-               }
+               setup_audio_details ();
                break;
        case Film::SIZE:
                if (_film->size().width == 0 && _film->size().height == 0) {
@@ -405,47 +466,71 @@ 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 ()));
+               if (_film->length()) {
+                       _dcp_trim_start->SetRange (0, _film->length().get());
+                       _dcp_trim_end->SetRange (0, _film->length().get());
+               }
                break;
        case Film::DCP_CONTENT_TYPE:
-               _dcp_content_type->SetSelection (DCPContentType::as_index (_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:
                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 ()));
-               }
-               _sizer->Layout ();
-               break;
-       case Film::DCP_TRIM_ACTION:
-               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::DCP_TRIM_START:
+               checked_set (_dcp_trim_start, _film->dcp_trim_start());
+               break;
+       case Film::DCP_TRIM_END:
+               checked_set (_dcp_trim_end, _film->dcp_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 ());
+               checked_set (_with_subtitles, _film->with_subtitles ());
+               _subtitle_stream->Enable (_film->with_subtitles ());
+               _subtitle_scale->Enable (_film->with_subtitles ());
+               _subtitle_offset->Enable (_film->with_subtitles ());
+               _dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
+               break;
+       case Film::SUBTITLE_OFFSET:
+               checked_set (_subtitle_offset, _film->subtitle_offset ());
+               break;
+       case Film::SUBTITLE_SCALE:
+               checked_set (_subtitle_scale, _film->subtitle_scale() * 100);
+               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::AUDIO_STREAM:
+               checked_set (_audio_stream, _film->audio_stream_index ());
+               _dcp_name->SetLabel (std_to_wx (_film->dcp_name ()));
+               setup_audio_details ();
+               break;
+       case Film::SUBTITLE_STREAM:
+               checked_set (_subtitle_stream, _film->subtitle_stream_index ());
                break;
        }
 }
@@ -458,13 +543,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 */
@@ -475,24 +558,22 @@ FilmEditor::dcp_content_type_changed (wxCommandEvent &)
                return;
        }
 
-       _ignore_changes = Film::DCP_CONTENT_TYPE;
        int const n = _dcp_content_type->GetSelection ();
        if (n >= 0) {
                _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) {
@@ -507,18 +588,23 @@ FilmEditor::set_film (Film* f)
        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_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_CHANNELS);
        film_changed (Film::AUDIO_SAMPLE_RATE);
        film_changed (Film::SCALER);
        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::DCI_METADATA);
 }
 
 /** Updates the sensitivity of lots of widgets to a given value.
@@ -527,8 +613,11 @@ 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);
        _left_crop->Enable (s);
@@ -537,22 +626,25 @@ FilmEditor::set_things_sensitive (bool 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);
+       _dcp_trim_start->Enable (s);
+       _dcp_trim_end->Enable (s);
        _dcp_ab->Enable (s);
        _audio_gain->Enable (s);
        _audio_gain_calculate_button->Enable (s);
        _audio_delay->Enable (s);
        _still_duration->Enable (s);
+
+       setup_subtitle_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 ();
 }
@@ -565,12 +657,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
@@ -580,9 +670,7 @@ FilmEditor::audio_gain_changed (wxCommandEvent &)
                return;
        }
 
-       _ignore_changes = Film::AUDIO_GAIN;
        _film->set_audio_gain (_audio_gain->GetValue ());
-       _ignore_changes = Film::NONE;
 }
 
 void
@@ -592,9 +680,7 @@ FilmEditor::audio_delay_changed (wxCommandEvent &)
                return;
        }
 
-       _ignore_changes = Film::AUDIO_DELAY;
        _film->set_audio_delay (_audio_delay->GetValue ());
-       _ignore_changes = Film::NONE;
 }
 
 wxControl *
@@ -638,24 +724,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::dcp_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_dcp_trim_start (_dcp_trim_start->GetValue ());
 }
 
 void
-FilmEditor::dcp_range_changed (int frames, TrimAction action)
+FilmEditor::dcp_trim_end_changed (wxCommandEvent &)
 {
-       _film->set_dcp_frames (frames);
-       _film->set_dcp_trim_action (action);
+       if (!_film) {
+               return;
+       }
+
+       _film->set_dcp_trim_end (_dcp_trim_end->GetValue ());
 }
 
 void
@@ -720,17 +809,97 @@ FilmEditor::with_subtitles_toggled (wxCommandEvent &)
                return;
        }
 
-       _ignore_changes = Film::WITH_SUBTITLES;
        _film->set_with_subtitles (_with_subtitles->GetValue ());
-       _ignore_changes = Film::NONE;
 }
 
 void
-FilmEditor::setup_subtitle_button ()
+FilmEditor::setup_subtitle_control_sensitivity ()
+{
+       bool h = false;
+       if (_generally_sensitive && _film) {
+               h = _film->has_subtitles();
+       }
+       
+       _with_subtitles->Enable (h);
+       _subtitle_stream->Enable (h);
+       _subtitle_offset->Enable (h);
+       _subtitle_scale->Enable (h);
+}
+
+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 &)
 {
-       _with_subtitles->Enable (_film->has_subtitles ());
-       if (!_film->has_subtitles ()) {
-               _with_subtitles->SetValue (false);
+       if (!_film) {
+               return;
        }
+
+       DCINameDialog* d = new DCINameDialog (this, _film);
+       d->ShowModal ();
+       d->Destroy ();
 }
 
+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()));
+       }
+       _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()));
+       }
+       _subtitle_stream->SetSelection (_film->subtitle_stream_index ());
+}
+
+void
+FilmEditor::audio_stream_changed (wxCommandEvent &)
+{
+       if (!_film) {
+               return;
+       }
+
+       _film->set_audio_stream (_audio_stream->GetSelection ());
+}
+
+void
+FilmEditor::subtitle_stream_changed (wxCommandEvent &)
+{
+       if (!_film) {
+               return;
+       }
+
+       _film->set_subtitle_stream (_subtitle_stream->GetSelection ());
+}
+
+void
+FilmEditor::setup_audio_details ()
+{
+       if (_film->audio_channels() == 0 && _film->audio_sample_rate() == 0) {
+               _audio->SetLabel (wxT (""));
+       } else {
+               stringstream s;
+               s << _film->audio_channels () << " channels, " << _film->audio_sample_rate() << "Hz";
+               _audio->SetLabel (std_to_wx (s.str ()));
+       }
+}
+
+void
+FilmEditor::active_jobs_changed (bool a)
+{
+       set_things_sensitive (!a);
+}