X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.cc;h=8cf8c5fda9e7ebf84a88d9ac0676d379a1f8bf77;hb=e754a107a0003a7dcc84aaa3d1f01bac4d5591fd;hp=70305978061b820cc6eaf9862dea521e076d3691;hpb=62df6543cdeaa945afb4e0ea182da06102bea4ef;p=dcpomatic.git diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index 703059780..8cf8c5fda 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,8 +35,9 @@ #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" @@ -45,6 +47,7 @@ #include "scaler.h" using std::string; +using std::cout; using std::stringstream; using std::pair; using std::fixed; @@ -52,6 +55,7 @@ using std::setprecision; using std::list; using std::vector; using boost::shared_ptr; +using boost::dynamic_pointer_cast; /** @param f Film to edit */ FilmEditor::FilmEditor (shared_ptr f, wxWindow* parent) @@ -59,225 +63,314 @@ FilmEditor::FilmEditor (shared_ptr f, wxWindow* parent) , _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 (); - add_label_to_sizer (_sizer, this, "Name"); - _name = new wxTextCtrl (this, wxID_ANY); - _sizer->Add (_name, 1, wxEXPAND); + JobManager::instance()->ActiveJobsChanged.connect ( + bind (&FilmEditor::active_jobs_changed, this, _1) + ); + + setup_visibility (); + setup_formats (); +} + +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 wxComboBox (_film_panel, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, 0, 0, wxCB_READONLY); + _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); - 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); + { + 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")); + _dcp_trim_start = new wxSpinCtrl (_film_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)); + s->Add (video_control (_dcp_trim_start)); + video_control (add_label_to_sizer (s, _film_panel, "End")); + _dcp_trim_end = new wxSpinCtrl (_film_panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)); + s->Add (video_control (_dcp_trim_end)); + + _film_sizer->Add (s); + } - add_label_to_sizer (_sizer, this, "Content"); - _content = new wxFilePickerCtrl (this, wxID_ANY, wxT (""), wxT ("Select Content File"), wxT("*.*")); - _sizer->Add (_content, 1, wxEXPAND); + _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); + + /* 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); + } + + 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 ())); + } +} + +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_COMBOBOX_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_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); + _still_duration->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::still_duration_changed), 0, this); + _dcp_trim_start->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::dcp_trim_start_changed), 0, this); + _dcp_trim_end->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::dcp_trim_end_changed), 0, this); + _with_subtitles->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (FilmEditor::with_subtitles_toggled), 0, this); + _subtitle_offset->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::subtitle_offset_changed), 0, this); + _subtitle_scale->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::subtitle_scale_changed), 0, this); + _subtitle_stream->Connect (wxID_ANY, wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler (FilmEditor::subtitle_stream_changed), 0, this); + _audio_stream->Connect (wxID_ANY, wxEVT_COMMAND_COMBOBOX_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 + ); + } +} - add_label_to_sizer (_sizer, this, "Content Type"); - _dcp_content_type = new wxComboBox (this, wxID_ANY); - _sizer->Add (_dcp_content_type); +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 (_sizer, this, "Format"); - _format = new wxComboBox (this, wxID_ANY); - _sizer->Add (_format); + add_label_to_sizer (_video_sizer, _video_panel, "Format"); + _format = new wxComboBox (_video_panel, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, 0, 0, wxCB_READONLY); + _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 wxComboBox (_video_panel, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, 0, 0, wxCB_READONLY); + _video_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); + vector const sc = Scaler::all (); + for (vector::const_iterator i = sc.begin(); i != sc.end(); ++i) { + _scaler->Append (std_to_wx ((*i)->name())); } + _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); + _dcp_trim_start->SetRange (0, 100); + _dcp_trim_end->SetRange (0, 100); +} + +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); - - _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); + _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); - } - - video_control (add_label_to_sizer (_sizer, this, "Frames Per Second")); - _frames_per_second = new wxStaticText (this, wxID_ANY, wxT ("")); - _sizer->Add (video_control (_frames_per_second), 1, wxALIGN_CENTER_VERTICAL); - - video_control (add_label_to_sizer (_sizer, this, "Original Size")); - _original_size = new wxStaticText (this, wxID_ANY, wxT ("")); - _sizer->Add (video_control (_original_size), 1, wxALIGN_CENTER_VERTICAL); - - video_control (add_label_to_sizer (_sizer, this, "Length")); - _length = new wxStaticText (this, wxID_ANY, wxT ("")); - _sizer->Add (video_control (_length), 1, wxALIGN_CENTER_VERTICAL); - - - { - video_control (add_label_to_sizer (_sizer, this, "Trim frames")); - wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - add_label_to_sizer (s, this, "Start"); - _dcp_trim_start = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)); - s->Add (_dcp_trim_start); - add_label_to_sizer (s, this, "End"); - _dcp_trim_end = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)); - s->Add (_dcp_trim_end); - - _sizer->Add (s); + _audio_stream = new wxComboBox (_audio_panel, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, 0, 0, wxCB_READONLY); + 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); } - _dcp_ab = new wxCheckBox (this, wxID_ANY, wxT ("A/B")); - video_control (_dcp_ab); - _sizer->Add (_dcp_ab, 1); - _sizer->AddSpacer (0); - - /* STILL-only stuff */ - { - still_control (add_label_to_sizer (_sizer, this, "Duration")); - wxSizer* s = new wxBoxSizer (wxHORIZONTAL); - _still_duration = new wxSpinCtrl (this); - still_control (_still_duration); - s->Add (_still_duration, 1, wxEXPAND); - still_control (add_label_to_sizer (s, this, "s")); - _sizer->Add (s); + _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); } - /* Set up our editing widgets */ - - _left_crop->SetRange (0, 1024); - _top_crop->SetRange (0, 1024); - _right_crop->SetRange (0, 1024); - _bottom_crop->SetRange (0, 1024); _audio_gain->SetRange (-60, 60); _audio_delay->SetRange (-1000, 1000); - _still_duration->SetRange (0, 60 * 60); - _subtitle_offset->SetRange (-1024, 1024); - _subtitle_scale->SetRange (1, 1000); - _dcp_trim_start->SetRange (0, 100); - _dcp_trim_end->SetRange (0, 100); +} - vector 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 ())); - } +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); - vector const sc = Scaler::all (); - for (vector::const_iterator i = sc.begin(); i != sc.end(); ++i) { - _scaler->Append (std_to_wx ((*i)->name())); - } + _with_subtitles = new wxCheckBox (_subtitle_panel, wxID_ANY, wxT("With Subtitles")); + video_control (_with_subtitles); + _subtitle_sizer->Add (_with_subtitles, 1); + + _subtitle_stream = new wxComboBox (_subtitle_panel, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, 0, 0, wxCB_READONLY); + _subtitle_sizer->Add (video_control (_subtitle_stream)); - JobManager::instance()->ActiveJobsChanged.connect ( - bind (&FilmEditor::active_jobs_changed, this, _1) - ); + 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); - /* And set their values from the Film */ - set_film (f); - - /* Now connect to them, since initial values are safely set */ - _name->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (FilmEditor::name_changed), 0, this); - _use_dci_name->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (FilmEditor::use_dci_name_toggled), 0, this); - _edit_dci_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::edit_dci_button_clicked), 0, this); - _format->Connect (wxID_ANY, wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler (FilmEditor::format_changed), 0, this); - _content->Connect (wxID_ANY, wxEVT_COMMAND_FILEPICKER_CHANGED, wxCommandEventHandler (FilmEditor::content_changed), 0, this); - _left_crop->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::left_crop_changed), 0, this); - _right_crop->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::right_crop_changed), 0, this); - _top_crop->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::top_crop_changed), 0, this); - _bottom_crop->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::bottom_crop_changed), 0, this); - _filters_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::edit_filters_clicked), 0, this); - _scaler->Connect (wxID_ANY, wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler (FilmEditor::scaler_changed), 0, this); - _dcp_content_type->Connect (wxID_ANY, wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler (FilmEditor::dcp_content_type_changed), 0, this); - _dcp_ab->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (FilmEditor::dcp_ab_toggled), 0, this); - _audio_gain->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::audio_gain_changed), 0, this); - _audio_gain_calculate_button->Connect ( - wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::audio_gain_calculate_button_clicked), 0, this - ); - _audio_delay->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::audio_delay_changed), 0, this); - _still_duration->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::still_duration_changed), 0, this); - _dcp_trim_start->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::dcp_trim_start_changed), 0, this); - _dcp_trim_end->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::dcp_trim_end_changed), 0, this); - _with_subtitles->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (FilmEditor::with_subtitles_toggled), 0, this); - _subtitle_offset->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::subtitle_offset_changed), 0, this); - _subtitle_scale->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::subtitle_scale_changed), 0, this); - _audio_stream->Connect (wxID_ANY, wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler (FilmEditor::audio_stream_changed), 0, this); - _subtitle_stream->Connect (wxID_ANY, wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler (FilmEditor::subtitle_stream_changed), 0, this); + { + video_control (add_label_to_sizer (_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); + } - setup_visibility (); - setup_formats (); + _subtitle_offset->SetRange (-1024, 1024); + _subtitle_scale->SetRange (1, 1000); } /** Called when the left crop widget has been changed */ @@ -340,6 +433,16 @@ FilmEditor::content_changed (wxCommandEvent &) } } +void +FilmEditor::trust_content_header_changed (wxCommandEvent &) +{ + if (!_film) { + return; + } + + _film->set_trust_content_header (_trust_content_header->GetValue ()); +} + /** Called when the DCP A/B switch has been toggled */ void FilmEditor::dcp_ab_toggled (wxCommandEvent &) @@ -408,12 +511,14 @@ FilmEditor::film_changed (Film::Property p) setup_subtitle_control_sensitivity (); setup_streams (); break; - case Film::HAS_SUBTITLES: + case Film::TRUST_CONTENT_HEADER: + checked_set (_trust_content_header, _film->trust_content_header ()); + break; + case Film::SUBTITLE_STREAMS: setup_subtitle_control_sensitivity (); setup_streams (); break; - case Film::AUDIO_STREAMS: - case Film::SUBTITLE_STREAMS: + case Film::CONTENT_AUDIO_STREAMS: setup_streams (); break; case Film::FORMAT: @@ -424,7 +529,11 @@ FilmEditor::film_changed (Film::Property p) ++i; ++n; } - checked_set (_format, n); + if (i == _formats.end()) { + checked_set (_format, -1); + } else { + checked_set (_format, n); + } _dcp_name->SetLabel (std_to_wx (_film->dcp_name ())); break; } @@ -443,7 +552,7 @@ 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: @@ -455,9 +564,6 @@ FilmEditor::film_changed (Film::Property p) s << fixed << setprecision(2) << _film->frames_per_second(); _frames_per_second->SetLabel (std_to_wx (s.str ())); break; - case Film::AUDIO_SAMPLE_RATE: - setup_audio_details (); - break; case Film::SIZE: if (_film->size().width == 0 && _film->size().height == 0) { _original_size->SetLabel (wxT ("")); @@ -482,8 +588,6 @@ FilmEditor::film_changed (Film::Property p) 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_AB: checked_set (_dcp_ab, _film->dcp_ab ()); break; @@ -507,9 +611,7 @@ FilmEditor::film_changed (Film::Property p) break; case 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 ()); + setup_subtitle_control_sensitivity (); _dcp_name->SetLabel (std_to_wx (_film->dcp_name ())); break; case Film::SUBTITLE_OFFSET: @@ -525,15 +627,36 @@ FilmEditor::film_changed (Film::Property p) 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 ()); + 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: - checked_set (_subtitle_stream, _film->subtitle_stream_index ()); + if (_film->subtitle_stream()) { + checked_set (_subtitle_stream, _film->subtitle_stream()->to_string()); + } + break; + case Film::EXTERNAL_AUDIO: + { + vector 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 */ @@ -560,7 +683,7 @@ FilmEditor::dcp_content_type_changed (wxCommandEvent &) } int const n = _dcp_content_type->GetSelection (); - if (n >= 0) { + if (n != wxNOT_FOUND) { _film->set_dcp_content_type (DCPContentType::from_index (n)); } } @@ -584,28 +707,32 @@ FilmEditor::set_film (shared_ptr 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::SCALER); film_changed (Film::DCP_TRIM_START); film_changed (Film::DCP_TRIM_END); film_changed (Film::DCP_AB); - film_changed (Film::SIZE); - film_changed (Film::LENGTH); - film_changed (Film::FRAMES_PER_SECOND); - film_changed (Film::AUDIO_SAMPLE_RATE); - film_changed (Film::SCALER); + film_changed (Film::CONTENT_AUDIO_STREAM); + film_changed (Film::EXTERNAL_AUDIO); + film_changed (Film::USE_CONTENT_AUDIO); film_changed (Film::AUDIO_GAIN); film_changed (Film::AUDIO_DELAY); film_changed (Film::STILL_DURATION); film_changed (Film::WITH_SUBTITLES); - film_changed (Film::HAS_SUBTITLES); film_changed (Film::SUBTITLE_OFFSET); film_changed (Film::SUBTITLE_SCALE); - film_changed (Film::USE_DCI_NAME); film_changed (Film::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. @@ -621,6 +748,7 @@ FilmEditor::set_things_sensitive (bool 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); @@ -638,6 +766,7 @@ FilmEditor::set_things_sensitive (bool s) _still_duration->Enable (s); setup_subtitle_control_sensitivity (); + setup_audio_control_sensitivity (); } /** Called when the `Edit filters' button has been clicked */ @@ -715,7 +844,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 @@ -800,7 +941,7 @@ FilmEditor::setup_formats () _format->Append (std_to_wx ((*i)->name ())); } - _sizer->Layout (); + _film_sizer->Layout (); } void @@ -818,13 +959,28 @@ FilmEditor::setup_subtitle_control_sensitivity () { bool h = false; if (_generally_sensitive && _film) { - h = _film->has_subtitles(); + h = !_film->subtitle_streams().empty(); } _with_subtitles->Enable (h); - _subtitle_stream->Enable (h); - _subtitle_offset->Enable (h); - _subtitle_scale->Enable (h); + _subtitle_stream->Enable (_film->with_subtitles ()); + _subtitle_offset->Enable (_film->with_subtitles ()); + _subtitle_scale->Enable (_film->with_subtitles ()); +} + +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 @@ -853,18 +1009,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->SetValue (wxT ("")); } - _subtitle_stream->SetSelection (_film->subtitle_stream_index ()); } void @@ -874,7 +1039,12 @@ FilmEditor::audio_stream_changed (wxCommandEvent &) return; } - _film->set_audio_stream (_audio_stream->GetSelection ()); + _film->set_content_audio_stream ( + audio_stream_factory ( + string_client_data (_audio_stream->GetClientObject (_audio_stream->GetSelection ())), + Film::state_version + ) + ); } void @@ -884,17 +1054,22 @@ FilmEditor::subtitle_stream_changed (wxCommandEvent &) return; } - _film->set_subtitle_stream (_subtitle_stream->GetSelection ()); + _film->set_subtitle_stream ( + subtitle_stream_factory ( + string_client_data (_subtitle_stream->GetClientObject (_subtitle_stream->GetSelection ())), + Film::state_version + ) + ); } void FilmEditor::setup_audio_details () { - if (_film->audio_channels() == 0 && _film->audio_sample_rate() == 0) { + if (!_film->audio_stream()) { _audio->SetLabel (wxT ("")); } else { stringstream s; - s << _film->audio_channels () << " channels, " << _film->audio_sample_rate() << "Hz"; + s << _film->audio_stream()->channels () << " channels, " << _film->audio_stream()->sample_rate() << "Hz"; _audio->SetLabel (std_to_wx (s.str ())); } } @@ -904,3 +1079,20 @@ 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); +}