X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.cc;h=7038a18b0367a18e436cd70aac26114df1e44fe9;hb=fa1ac8629ae03c152ee85c0a82ed979557e4be00;hp=abbb8fa223650d1b585eb0dd497df49727d84650;hpb=81e0ec64eccf10232628fdf89149b3a66f231312;p=dcpomatic.git diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index abbb8fa22..7038a18b0 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -32,142 +32,188 @@ #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 "filter_dialog.h" #include "wx_util.h" #include "film_editor.h" -//#include "dcp_range_dialog.h" - -using namespace std; -using namespace boost; +#include "dcp_range_dialog.h" +#include "gain_calculator_dialog.h" +#include "sound_processor.h" +#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 f, wxWindow* parent) : wxPanel (parent) - , _ignore_changes (false) + , _ignore_changes (Film::NONE) , _film (f) { - wxSizer* sizer = new wxFlexGridSizer (2, 6, 6); - SetSizer (sizer); + _sizer = new wxFlexGridSizer (2, 4, 4); + SetSizer (_sizer); - add_label_to_sizer (sizer, this, "Name"); + add_label_to_sizer (_sizer, this, "Name"); _name = new wxTextCtrl (this, wxID_ANY); - sizer->Add (_name, 1, wxEXPAND); + _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"); + add_label_to_sizer (_sizer, this, "Content"); _content = new wxFilePickerCtrl (this, wxID_ANY, wxT (""), wxT ("Select Content File"), wxT("*.*")); - sizer->Add (_content, 1, wxEXPAND); + _sizer->Add (_content, 1, wxEXPAND); - add_label_to_sizer (sizer, this, "Content Type"); + add_label_to_sizer (_sizer, this, "Content Type"); _dcp_content_type = new wxComboBox (this, wxID_ANY); - sizer->Add (_dcp_content_type); + _sizer->Add (_dcp_content_type); - add_label_to_sizer (sizer, this, "Frames Per Second"); - _frames_per_second = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, 0, wxTextValidator (wxFILTER_NUMERIC)); - sizer->Add (video_control (_frames_per_second)); - - add_label_to_sizer (sizer, this, "Format"); + add_label_to_sizer (_sizer, this, "Format"); _format = new wxComboBox (this, wxID_ANY); - sizer->Add (_format); + _sizer->Add (_format); { - add_label_to_sizer (sizer, this, "Crop"); + add_label_to_sizer (_sizer, this, "Crop"); wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - wxPanel* p = new wxPanel (this); - p->SetSizer (s); - add_label_to_sizer (s, p, "L"); - _left_crop = new wxSpinCtrl (p, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)); + 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, p, "R"); - _right_crop = new wxSpinCtrl (p, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)); + 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, p, "T"); - _top_crop = new wxSpinCtrl (p, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)); + 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, p, "B"); - _bottom_crop = new wxSpinCtrl (p, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)); + add_label_to_sizer (s, this, "B"); + _bottom_crop = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (64, -1)); s->Add (_bottom_crop, 0); - sizer->Add (p); + _sizer->Add (s); } /* VIDEO-only stuff */ { - video_control (add_label_to_sizer (sizer, this, "Filters")); - wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - wxPanel* p = new wxPanel (this); - p->SetSizer (s); - _filters = new wxStaticText (p, wxID_ANY, wxT ("")); - s->Add (_filters, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxALL, 6); - _filters_button = new wxButton (p, wxID_ANY, wxT ("Edit...")); + video_control (add_label_to_sizer (_sizer, this, "Filters")); + wxSizer* s = new wxBoxSizer (wxHORIZONTAL); + _filters = new wxStaticText (this, 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...")); + video_control (_filters_button); s->Add (_filters_button, 0); - sizer->Add (p, 1); + _sizer->Add (s, 1); } - video_control (add_label_to_sizer (sizer, this, "Scaler")); + video_control (add_label_to_sizer (_sizer, this, "Scaler")); _scaler = new wxComboBox (this, wxID_ANY); - sizer->Add (video_control (_scaler), 1); + _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")); + video_control (add_label_to_sizer (_sizer, this, "Audio Gain")); wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - wxPanel* p = new wxPanel (this); - p->SetSizer (s); - _audio_gain = new wxSpinCtrl (p); + _audio_gain = new wxSpinCtrl (this); s->Add (video_control (_audio_gain), 1); - video_control (add_label_to_sizer (s, p, "dB")); - sizer->Add (p); + video_control (add_label_to_sizer (s, this, "dB")); + _audio_gain_calculate_button = new wxButton (this, wxID_ANY, _("Calculate...")); + video_control (_audio_gain_calculate_button); + s->Add (_audio_gain_calculate_button, 1, wxEXPAND); + _sizer->Add (s); } { - video_control (add_label_to_sizer (sizer, this, "Audio Delay")); + video_control (add_label_to_sizer (_sizer, this, "Audio Delay")); wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - wxPanel* p = new wxPanel (this); - p->SetSizer (s); - _audio_delay = new wxSpinCtrl (p); + _audio_delay = new wxSpinCtrl (this); s->Add (video_control (_audio_delay), 1); - video_control (add_label_to_sizer (s, p, "ms")); - sizer->Add (p); + video_control (add_label_to_sizer (s, this, "ms")); + _sizer->Add (s); } - video_control (add_label_to_sizer (sizer, this, "Original Size")); + _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")); + 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); + _sizer->Add (video_control (_original_size), 1, wxALIGN_CENTER_VERTICAL); - video_control (add_label_to_sizer (sizer, this, "Length")); + 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); + _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, "Range")); wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - wxPanel* p = new wxPanel (this); - p->SetSizer (s); - _dcp_range = new wxStaticText (p, wxID_ANY, wxT ("")); - s->Add (video_control (_dcp_range), 1, wxALIGN_CENTER_VERTICAL); - _change_dcp_range_button = new wxButton (p, wxID_ANY, wxT ("Edit...")); - s->Add (video_control (_change_dcp_range_button)); - sizer->Add (p); + _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); } _dcp_ab = new wxCheckBox (this, wxID_ANY, wxT ("A/B")); - sizer->Add (_dcp_ab, 1); - sizer->AddSpacer (0); + video_control (_dcp_ab); + _sizer->Add (_dcp_ab, 1); + _sizer->AddSpacer (0); /* STILL-only stuff */ - still_control (add_label_to_sizer (sizer, this, "Duration")); - _still_duration = new wxSpinCtrl (this); - sizer->Add (still_control (_still_duration)); - still_control (add_label_to_sizer (sizer, this, "s")); + { + 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); + } /* Set up our editing widgets */ @@ -178,11 +224,8 @@ FilmEditor::FilmEditor (Film* f, wxWindow* parent) _audio_gain->SetRange (-60, 60); _audio_delay->SetRange (-1000, 1000); _still_duration->SetRange (0, 60 * 60); - - vector fmt = Format::all (); - for (vector::iterator i = fmt.begin(); i != fmt.end(); ++i) { - _format->Append (std_to_wx ((*i)->name ())); - } + _subtitle_offset->SetRange (-1024, 1024); + _subtitle_scale->SetRange (1, 1000); vector const ct = DCPContentType::all (); for (vector::const_iterator i = ct.begin(); i != ct.end(); ++i) { @@ -194,12 +237,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); - _frames_per_second->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (FilmEditor::frames_per_second_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); @@ -211,11 +259,20 @@ FilmEditor::FilmEditor (Film* f, wxWindow* parent) _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 (); } /** Called when the left crop widget has been changed */ @@ -226,9 +283,9 @@ FilmEditor::left_crop_changed (wxCommandEvent &) return; } - _ignore_changes = true; + _ignore_changes = Film::CROP; _film->set_left_crop (_left_crop->GetValue ()); - _ignore_changes = false; + _ignore_changes = Film::NONE; } /** Called when the right crop widget has been changed */ @@ -239,9 +296,9 @@ FilmEditor::right_crop_changed (wxCommandEvent &) return; } - _ignore_changes = true; + _ignore_changes = Film::CROP; _film->set_right_crop (_right_crop->GetValue ()); - _ignore_changes = false; + _ignore_changes = Film::NONE; } /** Called when the top crop widget has been changed */ @@ -252,9 +309,9 @@ FilmEditor::top_crop_changed (wxCommandEvent &) return; } - _ignore_changes = true; + _ignore_changes = Film::CROP; _film->set_top_crop (_top_crop->GetValue ()); - _ignore_changes = false; + _ignore_changes = Film::NONE; } /** Called when the bottom crop value has been changed */ @@ -265,9 +322,9 @@ FilmEditor::bottom_crop_changed (wxCommandEvent &) return; } - _ignore_changes = true; + _ignore_changes = Film::CROP; _film->set_bottom_crop (_bottom_crop->GetValue ()); - _ignore_changes = false; + _ignore_changes = Film::NONE; } /** Called when the content filename has been changed */ @@ -278,18 +335,21 @@ FilmEditor::content_changed (wxCommandEvent &) return; } - _ignore_changes = true; + _ignore_changes = Film::CONTENT; try { _film->set_content (wx_to_std (_content->GetPath ())); } catch (std::exception& e) { _content->SetPath (std_to_wx (_film->directory ())); - stringstream m; - m << "Could not set content: " << e.what() << "."; - error_dialog (this, m.str ()); + error_dialog (this, String::compose ("Could not set content: %1", e.what ())); } - _ignore_changes = false; + _ignore_changes = Film::NONE; + + setup_visibility (); + setup_formats (); + setup_subtitle_button (); + setup_streams (); } /** Called when the DCP A/B switch has been toggled */ @@ -300,9 +360,9 @@ FilmEditor::dcp_ab_toggled (wxCommandEvent &) return; } - _ignore_changes = true; + _ignore_changes = Film::DCP_AB; _film->set_dcp_ab (_dcp_ab->GetValue ()); - _ignore_changes = false; + _ignore_changes = Film::NONE; } /** Called when the name widget has been changed */ @@ -313,11 +373,39 @@ FilmEditor::name_changed (wxCommandEvent &) return; } - _ignore_changes = true; + _ignore_changes = Film::NAME; _film->set_name (string (_name->GetValue().mb_str())); - _ignore_changes = false; + _ignore_changes = Film::NONE; + + _film->set_dci_date_today (); + _dcp_name->SetLabel (std_to_wx (_film->dcp_name ())); } +void +FilmEditor::subtitle_offset_changed (wxCommandEvent &) +{ + if (!_film) { + return; + } + + _ignore_changes = Film::SUBTITLE_OFFSET; + _film->set_subtitle_offset (_subtitle_offset->GetValue ()); + _ignore_changes = Film::NONE; +} + +void +FilmEditor::subtitle_scale_changed (wxCommandEvent &) +{ + if (!_film) { + return; + } + + _ignore_changes = Film::SUBTITLE_OFFSET; + _film->set_subtitle_scale (_subtitle_scale->GetValue() / 100.0); + _ignore_changes = Film::NONE; +} + + /** 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. @@ -325,57 +413,72 @@ FilmEditor::name_changed (wxCommandEvent &) void FilmEditor::film_changed (Film::Property p) { - if (!_film || _ignore_changes) { + ensure_ui_thread (); + + if (!_film || _ignore_changes == p) { return; } stringstream s; switch (p) { + case Film::NONE: + break; case Film::CONTENT: _content->SetPath (std_to_wx (_film->content ())); setup_visibility (); + setup_formats (); + setup_subtitle_button (); + setup_streams (); break; - case Film::FORMAT: - _format->SetSelection (Format::as_index (_film->format ())); - break; - case Film::LEFT_CROP: - _left_crop->SetValue (_film->left_crop ()); + case Film::HAS_SUBTITLES: + setup_subtitle_button (); + setup_streams (); break; - case Film::RIGHT_CROP: - _right_crop->SetValue (_film->right_crop ()); + case Film::AUDIO_STREAMS: + case Film::SUBTITLE_STREAMS: + setup_streams (); break; - case Film::TOP_CROP: - _top_crop->SetValue (_film->top_crop ()); + case Film::FORMAT: + { + int n = 0; + vector::iterator i = _formats.begin (); + while (i != _formats.end() && *i != _film->format ()) { + ++i; + ++n; + } + _format->SetSelection (n); + _dcp_name->SetLabel (std_to_wx (_film->dcp_name ())); break; - case Film::BOTTOM_CROP: - _bottom_crop->SetValue (_film->bottom_crop ()); + } + 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); break; case Film::FILTERS: { pair p = Filter::ffmpeg_strings (_film->filters ()); - string const b = p.first + " " + p.second; - _filters->SetLabel (std_to_wx (b)); + if (p.first.empty () && p.second.empty ()) { + _filters->SetLabel (_("None")); + } else { + string const b = p.first + " " + p.second; + _filters->SetLabel (std_to_wx (b)); + } + _sizer->Layout (); break; } case Film::NAME: _name->ChangeValue (std_to_wx (_film->name ())); + _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->ChangeValue (std_to_wx (s.str ())); + _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) { @@ -386,35 +489,36 @@ FilmEditor::film_changed (Film::Property p) } break; case Film::LENGTH: - if (_film->frames_per_second() > 0 && _film->length() > 0) { - s << _film->length() << " frames; " << seconds_to_hms (_film->length() / _film->frames_per_second()); - } else if (_film->length() > 0) { - s << _film->length() << " frames"; + if (_film->frames_per_second() > 0 && _film->length()) { + s << _film->length().get() << " frames; " << seconds_to_hms (_film->length().get() / _film->frames_per_second()); + } else if (_film->length()) { + s << _film->length().get() << " frames"; } _length->SetLabel (std_to_wx (s.str ())); break; case Film::DCP_CONTENT_TYPE: _dcp_content_type->SetSelection (DCPContentType::as_index (_film->dcp_content_type ())); + _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 ())); - } - break; - case Film::DCP_TRIM_ACTION: - break; case Film::DCP_AB: _dcp_ab->SetValue (_film->dcp_ab ()); break; case Film::SCALER: _scaler->SetSelection (Scaler::as_index (_film->scaler ())); break; + case Film::DCP_TRIM_START: + case Film::DCP_TRIM_END: + if (_film->dcp_trim_start() == 0 && _film->dcp_trim_end() == 0) { + _dcp_range->SetLabel (wxT ("Whole film")); + } else { + _dcp_range->SetLabel ( + std_to_wx (String::compose ("Trim %1 frames from start and %2 frames from end", _film->dcp_trim_start(), _film->dcp_trim_end())) + ); + } + _sizer->Layout (); + break; case Film::AUDIO_GAIN: _audio_gain->SetValue (_film->audio_gain ()); break; @@ -424,6 +528,33 @@ FilmEditor::film_changed (Film::Property p) case Film::STILL_DURATION: _still_duration->SetValue (_film->still_duration ()); break; + case Film::WITH_SUBTITLES: + _with_subtitles->SetValue (_film->with_subtitles ()); + _subtitle_scale->Enable (_film->with_subtitles ()); + _subtitle_offset->Enable (_film->with_subtitles ()); + _dcp_name->SetLabel (std_to_wx (_film->dcp_name ())); + break; + case Film::SUBTITLE_OFFSET: + _subtitle_offset->SetValue (_film->subtitle_offset ()); + break; + case Film::SUBTITLE_SCALE: + _subtitle_scale->SetValue (_film->subtitle_scale() * 100); + break; + case Film::USE_DCI_NAME: + _use_dci_name->SetValue (_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: + _dcp_name->SetLabel (std_to_wx (_film->dcp_name ())); + _audio_stream->SetSelection (_film->audio_stream_index ()); + setup_audio_details (); + break; + case Film::SUBTITLE_STREAM: + _subtitle_stream->SetSelection (_film->subtitle_stream_index ()); + break; } } @@ -435,12 +566,15 @@ FilmEditor::format_changed (wxCommandEvent &) return; } - _ignore_changes = true; + _ignore_changes = Film::FORMAT; int const n = _format->GetSelection (); if (n >= 0) { - _film->set_format (Format::from_index (n)); + assert (n < int (_formats.size())); + _film->set_format (_formats[n]); } - _ignore_changes = false; + _ignore_changes = Film::NONE; + + _dcp_name->SetLabel (std_to_wx (_film->dcp_name ())); } /** Called when the DCP content type widget has been changed */ @@ -451,24 +585,26 @@ FilmEditor::dcp_content_type_changed (wxCommandEvent &) return; } - _ignore_changes = true; + _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 = false; + _ignore_changes = Film::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) { @@ -481,23 +617,24 @@ FilmEditor::set_film (Film* f) film_changed (Film::CONTENT); film_changed (Film::DCP_CONTENT_TYPE); film_changed (Film::FORMAT); - film_changed (Film::LEFT_CROP); - film_changed (Film::RIGHT_CROP); - film_changed (Film::TOP_CROP); - film_changed (Film::BOTTOM_CROP); + 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::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. @@ -507,7 +644,8 @@ void FilmEditor::set_things_sensitive (bool 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); @@ -516,22 +654,28 @@ 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_ab->Enable (s); _audio_gain->Enable (s); + _audio_gain_calculate_button->Enable (s); _audio_delay->Enable (s); + _subtitle_stream->Enable (s); _still_duration->Enable (s); + _with_subtitles->Enable (s); + _subtitle_offset->Enable (s); + _subtitle_scale->Enable (s); } /** Called when the `Edit filters' button has been clicked */ void FilmEditor::edit_filters_clicked (wxCommandEvent &) { -// FilterDialog d (_film->filters ()); -// d.ActiveChanged.connect (sigc::mem_fun (*_film, &Film::set_filters)); -// d.run (); + FilterDialog* d = new FilterDialog (this, _film->filters()); + d->ActiveChanged.connect (bind (&Film::set_filters, _film, _1)); + d->ShowModal (); + d->Destroy (); } /** Called when the scaler widget has been changed */ @@ -542,25 +686,12 @@ FilmEditor::scaler_changed (wxCommandEvent &) return; } - _ignore_changes = true; + _ignore_changes = Film::SCALER; int const n = _scaler->GetSelection (); if (n >= 0) { _film->set_scaler (Scaler::from_index (n)); } - _ignore_changes = false; -} - -/** Called when the frames per second widget has been changed */ -void -FilmEditor::frames_per_second_changed (wxCommandEvent &) -{ - if (!_film) { - return; - } - - _ignore_changes = true; - _film->set_frames_per_second (boost::lexical_cast (wx_to_std (_frames_per_second->GetValue ()))); - _ignore_changes = false; + _ignore_changes = Film::NONE; } void @@ -570,9 +701,9 @@ FilmEditor::audio_gain_changed (wxCommandEvent &) return; } - _ignore_changes = true; + _ignore_changes = Film::AUDIO_GAIN; _film->set_audio_gain (_audio_gain->GetValue ()); - _ignore_changes = false; + _ignore_changes = Film::NONE; } void @@ -582,9 +713,9 @@ FilmEditor::audio_delay_changed (wxCommandEvent &) return; } - _ignore_changes = true; + _ignore_changes = Film::AUDIO_DELAY; _film->set_audio_delay (_audio_delay->GetValue ()); - _ignore_changes = false; + _ignore_changes = Film::NONE; } wxControl * @@ -617,6 +748,8 @@ FilmEditor::setup_visibility () for (list::iterator i = _still_controls.begin(); i != _still_controls.end(); ++i) { (*i)->Show (c == STILL); } + + _sizer->Layout (); } void @@ -626,24 +759,190 @@ FilmEditor::still_duration_changed (wxCommandEvent &) return; } - _ignore_changes = true; + _ignore_changes = Film::STILL_DURATION; _film->set_still_duration (_still_duration->GetValue ()); - _ignore_changes = false; + _ignore_changes = Film::NONE; } void FilmEditor::change_dcp_range_clicked (wxCommandEvent &) { -//XXX DCPRangeDialog d (_film); -//XXX d.Changed.connect (sigc::mem_fun (*this, &FilmEditor::dcp_range_changed)); -//XXX d.run (); + DCPRangeDialog* d = new DCPRangeDialog (this, _film); + d->Changed.connect (bind (&FilmEditor::dcp_range_changed, this, _1, _2)); + d->ShowModal (); +} + +void +FilmEditor::dcp_range_changed (int start, int end) +{ + _film->set_dcp_trim_start (start); + _film->set_dcp_trim_end (end); +} + +void +FilmEditor::audio_gain_calculate_button_clicked (wxCommandEvent &) +{ + GainCalculatorDialog* d = new GainCalculatorDialog (this); + d->ShowModal (); + + if (d->wanted_fader() == 0 || d->actual_fader() == 0) { + d->Destroy (); + return; + } + + _audio_gain->SetValue ( + Config::instance()->sound_processor()->db_for_fader_change ( + d->wanted_fader (), + d->actual_fader () + ) + ); + + /* This appears to be necessary, as the change is not signalled, + I think. + */ + wxCommandEvent dummy; + audio_gain_changed (dummy); + + d->Destroy (); +} + +void +FilmEditor::setup_formats () +{ + ContentType c = VIDEO; + + if (_film) { + c = _film->content_type (); + } + + _formats.clear (); + + vector fmt = Format::all (); + for (vector::iterator i = fmt.begin(); i != fmt.end(); ++i) { + if (c == VIDEO && dynamic_cast (*i)) { + _formats.push_back (*i); + } else if (c == STILL && dynamic_cast (*i)) { + _formats.push_back (*i); + } + } + + _format->Clear (); + for (vector::iterator i = _formats.begin(); i != _formats.end(); ++i) { + _format->Append (std_to_wx ((*i)->name ())); + } + + _sizer->Layout (); +} + +void +FilmEditor::with_subtitles_toggled (wxCommandEvent &) +{ + if (!_film) { + 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_button () +{ + _with_subtitles->Enable (_film->has_subtitles ()); + if (!_film->has_subtitles ()) { + _with_subtitles->SetValue (false); + } +} + +void +FilmEditor::use_dci_name_toggled (wxCommandEvent &) +{ + if (!_film) { + 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 +FilmEditor::edit_dci_button_clicked (wxCommandEvent &) +{ + if (!_film) { + return; + } + + DCINameDialog* d = new DCINameDialog (this, _film); + d->ShowModal (); + d->Destroy (); +} + +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())); + } + _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())); + } + _subtitle_stream->SetSelection (_film->subtitle_stream_index ()); +} + +void +FilmEditor::audio_stream_changed (wxCommandEvent &) +{ + if (!_film) { + 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 (); +} + +void +FilmEditor::subtitle_stream_changed (wxCommandEvent &) +{ + if (!_film) { + return; + } + + _ignore_changes = Film::SUBTITLE_STREAM; + _film->set_subtitle_stream (_subtitle_stream->GetSelection ()); + _ignore_changes = Film::NONE; +} + +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::dcp_range_changed (int frames, TrimAction action) +FilmEditor::active_jobs_changed (bool a) { - _ignore_changes = true; - _film->set_dcp_frames (frames); - _film->set_dcp_trim_action (action); - _ignore_changes = false; + set_things_sensitive (!a); }