X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.cc;h=c9f83677c6da5db1cf7ef2168890538d4d810e5b;hb=8bfb6ae0780b0bf3318c345df78518ad3fabc9fc;hp=5d651364882b60cf722561f65aff9aecc22e7df7;hpb=6b368187e7bc16cbe0e83858f35990e536c5ccc8;p=dcpomatic.git diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index 5d6513648..c9f83677c 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -34,234 +35,359 @@ #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 "dcp_range_dialog.h" #include "gain_calculator_dialog.h" #include "sound_processor.h" -#include "dci_name_dialog.h" - -using namespace std; -using namespace boost; +#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; +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 f, wxWindow* parent) : wxPanel (parent) - , _ignore_changes (FilmState::NONE) , _film (f) + , _generally_sensitive (true) + , _audio_dialog (0) { - _sizer = new wxFlexGridSizer (2, 4, 4); - SetSizer (_sizer); - - add_label_to_sizer (_sizer, this, "Name"); - _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); + 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 (); +} - _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); +void +FilmEditor::make_film_panel () +{ + _film_panel = new wxPanel (_notebook); + _film_sizer = new wxBoxSizer (wxVERTICAL); + _film_panel->SetSizer (_film_sizer); + + wxFlexGridSizer* grid = new wxFlexGridSizer (2, 4, 4); + _film_sizer->Add (grid, 0, wxALL, 8); + + add_label_to_sizer (grid, _film_panel, _("Name")); + _name = new wxTextCtrl (_film_panel, wxID_ANY); + grid->Add (_name, 1, wxEXPAND); + + add_label_to_sizer (grid, _film_panel, _("DCP Name")); + _dcp_name = new wxStaticText (_film_panel, wxID_ANY, wxT ("")); + grid->Add (_dcp_name, 0, wxALIGN_CENTER_VERTICAL | wxSHRINK); + + _use_dci_name = new wxCheckBox (_film_panel, wxID_ANY, _("Use DCI name")); + grid->Add (_use_dci_name, 1, wxEXPAND); + _edit_dci_button = new wxButton (_film_panel, wxID_ANY, _("Details...")); + grid->Add (_edit_dci_button, 0); + + add_label_to_sizer (grid, _film_panel, _("Content")); + _content = new wxFilePickerCtrl (_film_panel, wxID_ANY, wxT (""), _("Select Content File"), wxT("*.*")); + grid->Add (_content, 1, wxEXPAND); + + _trust_content_header = new wxCheckBox (_film_panel, wxID_ANY, _("Trust content's header")); + video_control (_trust_content_header); + grid->Add (_trust_content_header, 1); + grid->AddSpacer (0); + + add_label_to_sizer (grid, _film_panel, _("Content Type")); + _dcp_content_type = new wxChoice (_film_panel, wxID_ANY); + grid->Add (_dcp_content_type); + + video_control (add_label_to_sizer (grid, _film_panel, _("Original Frame Rate"))); + _frames_per_second = new wxStaticText (_film_panel, wxID_ANY, wxT ("")); + grid->Add (video_control (_frames_per_second), 1, wxALIGN_CENTER_VERTICAL); + + video_control (add_label_to_sizer (grid, _film_panel, _("Original Size"))); + _original_size = new wxStaticText (_film_panel, wxID_ANY, wxT ("")); + grid->Add (video_control (_original_size), 1, wxALIGN_CENTER_VERTICAL); + + video_control (add_label_to_sizer (grid, _film_panel, _("Length"))); + _length = new wxStaticText (_film_panel, wxID_ANY, wxT ("")); + grid->Add (video_control (_length), 1, wxALIGN_CENTER_VERTICAL); - add_label_to_sizer (_sizer, this, "Content"); - _content = new wxFilePickerCtrl (this, wxID_ANY, wxT (""), wxT ("Select Content File"), wxT("*.*")); - _sizer->Add (_content, 1, wxEXPAND); - add_label_to_sizer (_sizer, this, "Content Type"); - _dcp_content_type = new wxComboBox (this, wxID_ANY); - _sizer->Add (_dcp_content_type); + { + video_control (add_label_to_sizer (grid, _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)); + + grid->Add (s); + } - add_label_to_sizer (_sizer, this, "Format"); - _format = new wxComboBox (this, wxID_ANY); - _sizer->Add (_format); + _dcp_ab = new wxCheckBox (_film_panel, wxID_ANY, _("A/B")); + video_control (_dcp_ab); + grid->Add (_dcp_ab, 1); + grid->AddSpacer (0); + /* STILL-only stuff */ { - add_label_to_sizer (_sizer, this, "Crop"); - wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + still_control (add_label_to_sizer (grid, _film_panel, _("Duration"))); + 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); + } - 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); + vector const ct = DCPContentType::all (); + for (vector::const_iterator i = ct.begin(); i != ct.end(); ++i) { + _dcp_content_type->Append (std_to_wx ((*i)->pretty_name ())); + } +} - _sizer->Add (s); +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 + ); + _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 (grid, _video_panel, _("Scaler"))); + _scaler = new wxChoice (_video_panel, wxID_ANY); + grid->Add (video_control (_scaler), 1); + + vector const sc = Scaler::all (); + for (vector::const_iterator i = sc.begin(); i != sc.end(); ++i) { + _scaler->Append (std_to_wx ((*i)->name())); } - video_control (add_label_to_sizer (_sizer, this, "Scaler")); - _scaler = new wxComboBox (this, wxID_ANY); - _sizer->Add (video_control (_scaler), 1); + 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 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); + 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); } + _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); + + wxFlexGridSizer* grid = new wxFlexGridSizer (2, 4, 4); + _audio_sizer->Add (grid, 0, wxALL, 8); + + _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, "Audio Gain")); + video_control (add_label_to_sizer (grid, _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); + grid->Add (s); } { - video_control (add_label_to_sizer (_sizer, this, "Audio Delay")); + video_control (add_label_to_sizer (grid, _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); + /* TRANSLATORS: this is an abbreviation for milliseconds, the unit of time */ + video_control (add_label_to_sizer (s, _audio_panel, _("ms"))); + grid->Add (s); } - _with_subtitles = new wxCheckBox (this, wxID_ANY, wxT("With Subtitles")); - video_control (_with_subtitles); - _sizer->Add (_with_subtitles, 1); - - _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")); + _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); - _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); + grid->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); + _use_external_audio = new wxRadioButton (_audio_panel, wxID_ANY, _("Use external audio")); + grid->Add (_use_external_audio); + grid->AddSpacer (0); - { - 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); + for (int i = 0; i < MAX_AUDIO_CHANNELS; ++i) { + add_label_to_sizer (grid, _audio_panel, 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); } - _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 wxBoxSizer (wxVERTICAL); + _subtitle_panel->SetSizer (_subtitle_sizer); + wxFlexGridSizer* grid = new wxFlexGridSizer (2, 4, 4); + _subtitle_sizer->Add (grid, 0, wxALL, 8); - /* Set up our editing widgets */ + _with_subtitles = new wxCheckBox (_subtitle_panel, wxID_ANY, _("With Subtitles")); + video_control (_with_subtitles); + grid->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); + grid->Add (video_control (_subtitle_stream)); - vector const ct = DCPContentType::all (); - for (vector::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 (grid, _subtitle_panel, _("Subtitle Offset"))); + _subtitle_offset = new wxSpinCtrl (_subtitle_panel); + grid->Add (video_control (_subtitle_offset), 1); - vector const sc = Scaler::all (); - for (vector::const_iterator i = sc.begin(); i != sc.end(); ++i) { - _scaler->Append (std_to_wx ((*i)->name())); + { + 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); } - /* 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); - _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); - _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 (); + _subtitle_offset->SetRange (-1024, 1024); + _subtitle_scale->SetRange (1, 1000); } /** Called when the left crop widget has been changed */ @@ -272,9 +398,7 @@ FilmEditor::left_crop_changed (wxCommandEvent &) return; } - _ignore_changes = FilmState::CROP; _film->set_left_crop (_left_crop->GetValue ()); - _ignore_changes = FilmState::NONE; } /** Called when the right crop widget has been changed */ @@ -285,9 +409,7 @@ FilmEditor::right_crop_changed (wxCommandEvent &) return; } - _ignore_changes = FilmState::CROP; _film->set_right_crop (_right_crop->GetValue ()); - _ignore_changes = FilmState::NONE; } /** Called when the top crop widget has been changed */ @@ -298,9 +420,7 @@ FilmEditor::top_crop_changed (wxCommandEvent &) return; } - _ignore_changes = FilmState::CROP; _film->set_top_crop (_top_crop->GetValue ()); - _ignore_changes = FilmState::NONE; } /** Called when the bottom crop value has been changed */ @@ -311,9 +431,7 @@ FilmEditor::bottom_crop_changed (wxCommandEvent &) return; } - _ignore_changes = FilmState::CROP; _film->set_bottom_crop (_bottom_crop->GetValue ()); - _ignore_changes = FilmState::NONE; } /** Called when the content filename has been changed */ @@ -324,21 +442,22 @@ FilmEditor::content_changed (wxCommandEvent &) return; } - _ignore_changes = FilmState::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 ())); + error_dialog (this, wxString::Format (_("Could not set content: %s"), e.what ())); } +} - _ignore_changes = FilmState::NONE; +void +FilmEditor::trust_content_header_changed (wxCommandEvent &) +{ + if (!_film) { + return; + } - setup_visibility (); - setup_formats (); - setup_subtitle_button (); - setup_streams (); + _film->set_trust_content_header (_trust_content_header->GetValue ()); } /** Called when the DCP A/B switch has been toggled */ @@ -349,9 +468,7 @@ FilmEditor::dcp_ab_toggled (wxCommandEvent &) return; } - _ignore_changes = FilmState::DCP_AB; _film->set_dcp_ab (_dcp_ab->GetValue ()); - _ignore_changes = FilmState::NONE; } /** Called when the name widget has been changed */ @@ -362,11 +479,7 @@ FilmEditor::name_changed (wxCommandEvent &) return; } - _ignore_changes = FilmState::NAME; _film->set_name (string (_name->GetValue().mb_str())); - _ignore_changes = FilmState::NONE; - - _dcp_name->SetLabel (std_to_wx (_film->dcp_name ())); } void @@ -376,9 +489,7 @@ FilmEditor::subtitle_offset_changed (wxCommandEvent &) return; } - _ignore_changes = FilmState::SUBTITLE_OFFSET; _film->set_subtitle_offset (_subtitle_offset->GetValue ()); - _ignore_changes = FilmState::NONE; } void @@ -388,44 +499,66 @@ FilmEditor::subtitle_scale_changed (wxCommandEvent &) return; } - _ignore_changes = FilmState::SUBTITLE_OFFSET; _film->set_subtitle_scale (_subtitle_scale->GetValue() / 100.0); - _ignore_changes = FilmState::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. * @param p Property of the Film that has changed. */ void -FilmEditor::film_changed (FilmState::Property p) +FilmEditor::film_changed (Film::Property p) { - if (!_film || _ignore_changes == p) { + ensure_ui_thread (); + + if (!_film) { return; } stringstream s; switch (p) { - case FilmState::NONE: + case Film::NONE: break; - case FilmState::CONTENT: - _content->SetPath (std_to_wx (_film->content ())); + case Film::CONTENT: + checked_set (_content, _film->content ()); setup_visibility (); setup_formats (); - setup_subtitle_button (); + setup_subtitle_control_sensitivity (); setup_streams (); break; - case FilmState::HAS_SUBTITLES: - setup_subtitle_button (); + 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 FilmState::AUDIO_STREAMS: - case FilmState::SUBTITLE_STREAMS: + case Film::CONTENT_AUDIO_STREAMS: setup_streams (); break; - case FilmState::FORMAT: + case Film::FORMAT: { int n = 0; vector::iterator i = _formats.begin (); @@ -433,17 +566,21 @@ FilmEditor::film_changed (FilmState::Property p) ++i; ++n; } - _format->SetSelection (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 FilmState::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); + case Film::CROP: + 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 FilmState::FILTERS: + case Film::FILTERS: { pair p = Filter::ffmpeg_strings (_film->filters ()); if (p.first.empty () && p.second.empty ()) { @@ -452,21 +589,18 @@ FilmEditor::film_changed (FilmState::Property p) string const b = p.first + " " + p.second; _filters->SetLabel (std_to_wx (b)); } - _sizer->Layout (); + _film_sizer->Layout (); break; } - case FilmState::NAME: - _name->ChangeValue (std_to_wx (_film->name ())); - _dcp_name->SetLabel (std_to_wx (_film->dcp_name ())); + case Film::NAME: + checked_set (_name, _film->name()); + setup_dcp_name (); break; - case FilmState::FRAMES_PER_SECOND: + case Film::FRAMES_PER_SECOND: s << fixed << setprecision(2) << _film->frames_per_second(); _frames_per_second->SetLabel (std_to_wx (s.str ())); break; - case FilmState::AUDIO_SAMPLE_RATE: - setup_audio_details (); - break; - case FilmState::SIZE: + case Film::SIZE: if (_film->size().width == 0 && _film->size().height == 0) { _original_size->SetLabel (wxT ("")); } else { @@ -474,75 +608,99 @@ FilmEditor::film_changed (FilmState::Property p) _original_size->SetLabel (std_to_wx (s.str ())); } break; - case FilmState::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"; + 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()); + } else if (_film->length()) { + s << _film->length().get() << " frames"; } _length->SetLabel (std_to_wx (s.str ())); + if (_film->length()) { + _trim_start->SetRange (0, _film->length().get()); + _trim_end->SetRange (0, _film->length().get()); + } break; - case FilmState::DCP_CONTENT_TYPE: - _dcp_content_type->SetSelection (DCPContentType::as_index (_film->dcp_content_type ())); - _dcp_name->SetLabel (std_to_wx (_film->dcp_name ())); + case Film::DCP_INTRINSIC_DURATION: break; - case FilmState::THUMBS: + case Film::DCP_CONTENT_TYPE: + checked_set (_dcp_content_type, DCPContentType::as_index (_film->dcp_content_type ())); + setup_dcp_name (); break; - case FilmState::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 (); + case Film::DCP_AB: + checked_set (_dcp_ab, _film->dcp_ab ()); break; - case FilmState::DCP_TRIM_ACTION: + case Film::SCALER: + checked_set (_scaler, Scaler::as_index (_film->scaler ())); break; - case FilmState::DCP_AB: - _dcp_ab->SetValue (_film->dcp_ab ()); + case Film::TRIM_START: + checked_set (_trim_start, _film->trim_start()); break; - case FilmState::SCALER: - _scaler->SetSelection (Scaler::as_index (_film->scaler ())); + case Film::TRIM_END: + checked_set (_trim_end, _film->trim_end()); break; - case FilmState::AUDIO_GAIN: - _audio_gain->SetValue (_film->audio_gain ()); + case Film::AUDIO_GAIN: + checked_set (_audio_gain, _film->audio_gain ()); break; - case FilmState::AUDIO_DELAY: - _audio_delay->SetValue (_film->audio_delay ()); + case Film::AUDIO_DELAY: + checked_set (_audio_delay, _film->audio_delay ()); break; - case FilmState::STILL_DURATION: - _still_duration->SetValue (_film->still_duration ()); + case Film::STILL_DURATION: + checked_set (_still_duration, _film->still_duration ()); break; - case FilmState::WITH_SUBTITLES: - _with_subtitles->SetValue (_film->with_subtitles ()); - _subtitle_scale->Enable (_film->with_subtitles ()); - _subtitle_offset->Enable (_film->with_subtitles ()); - _dcp_name->SetLabel (std_to_wx (_film->dcp_name ())); + case Film::WITH_SUBTITLES: + checked_set (_with_subtitles, _film->with_subtitles ()); + setup_subtitle_control_sensitivity (); + setup_dcp_name (); break; - case FilmState::SUBTITLE_OFFSET: - _subtitle_offset->SetValue (_film->subtitle_offset ()); + case Film::SUBTITLE_OFFSET: + checked_set (_subtitle_offset, _film->subtitle_offset ()); break; - case FilmState::SUBTITLE_SCALE: - _subtitle_scale->SetValue (_film->subtitle_scale() * 100); + case Film::SUBTITLE_SCALE: + checked_set (_subtitle_scale, _film->subtitle_scale() * 100); break; - case FilmState::USE_DCI_NAME: - _use_dci_name->SetValue (_film->use_dci_name ()); - _dcp_name->SetLabel (std_to_wx (_film->dcp_name ())); + case Film::COLOUR_LUT: + checked_set (_colour_lut, _film->colour_lut ()); break; - case FilmState::DCI_METADATA: - _dcp_name->SetLabel (std_to_wx (_film->dcp_name ())); + 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 ()); + setup_dcp_name (); + break; + case Film::DCI_METADATA: + 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 FilmState::AUDIO_STREAM: - _dcp_name->SetLabel (std_to_wx (_film->dcp_name ())); - _audio_stream->SetSelection (_film->audio_stream_index ()); + 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: + if (_film->subtitle_stream()) { + checked_set (_subtitle_stream, _film->subtitle_stream()->to_string()); + } break; - case FilmState::SUBTITLE_STREAM: - _subtitle_stream->SetSelection (_film->subtitle_stream_index ()); + case Film::EXTERNAL_AUDIO: + { + vector 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; } + } } /** Called when the format widget has been changed */ @@ -553,15 +711,11 @@ FilmEditor::format_changed (wxCommandEvent &) return; } - _ignore_changes = FilmState::FORMAT; int const n = _format->GetSelection (); if (n >= 0) { assert (n < int (_formats.size())); _film->set_format (_formats[n]); } - _ignore_changes = FilmState::NONE; - - _dcp_name->SetLabel (std_to_wx (_film->dcp_name ())); } /** Called when the DCP content type widget has been changed */ @@ -572,26 +726,22 @@ FilmEditor::dcp_content_type_changed (wxCommandEvent &) return; } - _ignore_changes = FilmState::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 = FilmState::NONE; - - _dcp_name->SetLabel (std_to_wx (_film->dcp_name ())); } /** Sets the Film that we are editing */ void -FilmEditor::set_film (Film* f) +FilmEditor::set_film (shared_ptr 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) { @@ -599,29 +749,40 @@ FilmEditor::set_film (Film* f) } else { FileChanged (""); } + + if (_audio_dialog) { + _audio_dialog->set_film (_film); + } - film_changed (FilmState::NAME); - film_changed (FilmState::CONTENT); - film_changed (FilmState::DCP_CONTENT_TYPE); - film_changed (FilmState::FORMAT); - film_changed (FilmState::CROP); - film_changed (FilmState::FILTERS); - film_changed (FilmState::DCP_FRAMES); - film_changed (FilmState::DCP_TRIM_ACTION); - film_changed (FilmState::DCP_AB); - film_changed (FilmState::SIZE); - film_changed (FilmState::LENGTH); - film_changed (FilmState::FRAMES_PER_SECOND); - film_changed (FilmState::AUDIO_SAMPLE_RATE); - film_changed (FilmState::SCALER); - film_changed (FilmState::AUDIO_GAIN); - film_changed (FilmState::AUDIO_DELAY); - film_changed (FilmState::STILL_DURATION); - film_changed (FilmState::WITH_SUBTITLES); - film_changed (FilmState::SUBTITLE_OFFSET); - film_changed (FilmState::SUBTITLE_SCALE); - film_changed (FilmState::USE_DCI_NAME); - film_changed (FilmState::DCI_METADATA); + 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::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. @@ -630,29 +791,35 @@ FilmEditor::set_film (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); - _frames_per_second->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); + _show_audio->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 */ @@ -660,7 +827,7 @@ void FilmEditor::edit_filters_clicked (wxCommandEvent &) { FilterDialog* d = new FilterDialog (this, _film->filters()); - d->ActiveChanged.connect (sigc::mem_fun (*_film, &Film::set_filters)); + d->ActiveChanged.connect (bind (&Film::set_filters, _film, _1)); d->ShowModal (); d->Destroy (); } @@ -673,12 +840,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 @@ -688,9 +853,7 @@ FilmEditor::audio_gain_changed (wxCommandEvent &) return; } - _ignore_changes = Film::AUDIO_GAIN; _film->set_audio_gain (_audio_gain->GetValue ()); - _ignore_changes = Film::NONE; } void @@ -700,9 +863,7 @@ FilmEditor::audio_delay_changed (wxCommandEvent &) return; } - _ignore_changes = Film::AUDIO_DELAY; _film->set_audio_delay (_audio_delay->GetValue ()); - _ignore_changes = Film::NONE; } wxControl * @@ -736,7 +897,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 @@ -746,24 +919,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 @@ -818,7 +994,7 @@ FilmEditor::setup_formats () _format->Append (std_to_wx ((*i)->name ())); } - _sizer->Layout (); + _film_sizer->Layout (); } void @@ -828,20 +1004,41 @@ 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_subtitle_button () +FilmEditor::setup_audio_control_sensitivity () { - _with_subtitles->Enable (_film->has_subtitles ()); - if (!_film->has_subtitles ()) { - _with_subtitles->SetValue (false); + _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); } } @@ -852,11 +1049,7 @@ FilmEditor::use_dci_name_toggled (wxCommandEvent &) return; } - _ignore_changes = Film::USE_DCI_NAME; _film->set_use_dci_name (_use_dci_name->GetValue ()); - _ignore_changes = Film::NONE; - - _dcp_name->SetLabel (std_to_wx (_film->dcp_name ())); } void @@ -866,8 +1059,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 (); } @@ -875,18 +1069,27 @@ void FilmEditor::setup_streams () { _audio_stream->Clear (); - vector a = _film->audio_streams (); - for (vector::iterator i = a.begin(); i != a.end(); ++i) { - _audio_stream->Append (std_to_wx (i->name())); + vector > a = _film->content_audio_streams (); + for (vector >::iterator i = a.begin(); i != a.end(); ++i) { + shared_ptr ffa = dynamic_pointer_cast (*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 s = _film->subtitle_streams (); - for (vector::iterator i = s.begin(); i != s.end(); ++i) { - _subtitle_stream->Append (std_to_wx (i->name())); + vector > s = _film->subtitle_streams (); + for (vector >::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 @@ -896,12 +1099,12 @@ FilmEditor::audio_stream_changed (wxCommandEvent &) return; } - _ignore_changes = Film::AUDIO_STREAM; - _film->set_audio_stream (_audio_stream->GetSelection ()); - _ignore_changes = Film::NONE; - - _dcp_name->SetLabel (std_to_wx (_film->dcp_name ())); - setup_audio_details (); + _film->set_content_audio_stream ( + audio_stream_factory ( + string_client_data (_audio_stream->GetClientObject (_audio_stream->GetSelection ())), + Film::state_version + ) + ); } void @@ -911,19 +1114,75 @@ FilmEditor::subtitle_stream_changed (wxCommandEvent &) return; } - _ignore_changes = Film::SUBTITLE_STREAM; - _film->set_subtitle_stream (_subtitle_stream->GetSelection ()); - _ignore_changes = Film::NONE; + _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 ())); } } + +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 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) + "...")); + _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); +}