X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.cc;h=45c423355e3cc7578de2ef51a7d407045f94b1dc;hb=ae9b0b509787d244366eb8f69bdf9d563b6c6bb6;hp=cb14f70e786676af544b46afea0737eae26a2778;hpb=595f564a52d69d0401f5622c7d81cacda679005c;p=dcpomatic.git diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index cb14f70e7..45c423355 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -36,11 +36,15 @@ #include "lib/filter.h" #include "lib/ratio.h" #include "lib/config.h" -#include "lib/still_image_content.h" +#include "lib/image_content.h" +#include "lib/ffmpeg_content.h" #include "lib/sndfile_content.h" #include "lib/dcp_content_type.h" #include "lib/sound_processor.h" #include "lib/scaler.h" +#include "lib/playlist.h" +#include "lib/content.h" +#include "lib/content_factory.h" #include "timecode.h" #include "wx_util.h" #include "film_editor.h" @@ -68,7 +72,7 @@ using boost::lexical_cast; /** @param f Film to edit */ FilmEditor::FilmEditor (shared_ptr f, wxWindow* parent) : wxPanel (parent) - , _menu (f, this) + , _menu (this) , _generally_sensitive (true) , _timeline_dialog (0) { @@ -146,6 +150,14 @@ FilmEditor::make_dcp_panel () } ++r; + _signed = new wxCheckBox (_dcp_panel, wxID_ANY, _("Signed")); + grid->Add (_signed, wxGBPosition (r, 0), wxGBSpan (1, 2)); + ++r; + + _encrypted = new wxCheckBox (_dcp_panel, wxID_ANY, _("Encrypted")); + grid->Add (_encrypted, wxGBPosition (r, 0), wxGBSpan (1, 2)); + ++r; + add_label_to_grid_bag_sizer (grid, _dcp_panel, _("Audio channels"), true, wxGBPosition (r, 0)); _audio_channels = new wxSpinCtrl (_dcp_panel, wxID_ANY); grid->Add (_audio_channels, wxGBPosition (r, 1)); @@ -170,6 +182,11 @@ FilmEditor::make_dcp_panel () } ++r; + add_label_to_grid_bag_sizer (grid, _dcp_panel, _("Standard"), true, wxGBPosition (r, 0)); + _standard = new wxChoice (_dcp_panel, wxID_ANY); + grid->Add (_standard, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); + ++r; + add_label_to_grid_bag_sizer (grid, _dcp_panel, _("Scaler"), true, wxGBPosition (r, 0)); _scaler = new wxChoice (_dcp_panel, wxID_ANY); grid->Add (_scaler, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); @@ -196,10 +213,13 @@ FilmEditor::make_dcp_panel () } _audio_channels->SetRange (0, MAX_AUDIO_CHANNELS); - _j2k_bandwidth->SetRange (50, 250); + _j2k_bandwidth->SetRange (1, 250); _resolution->Append (_("2K")); _resolution->Append (_("4K")); + + _standard->Append (_("SMPTE")); + _standard->Append (_("Interop")); } void @@ -212,18 +232,24 @@ FilmEditor::connect_to_widgets () _content->Bind (wxEVT_COMMAND_LIST_ITEM_SELECTED, boost::bind (&FilmEditor::content_selection_changed, this)); _content->Bind (wxEVT_COMMAND_LIST_ITEM_DESELECTED, boost::bind (&FilmEditor::content_selection_changed, this)); _content->Bind (wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, boost::bind (&FilmEditor::content_right_click, this, _1)); - _content_add->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FilmEditor::content_add_clicked, this)); + _content_add_file->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FilmEditor::content_add_file_clicked, this)); + _content_add_folder->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FilmEditor::content_add_folder_clicked, this)); _content_remove->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FilmEditor::content_remove_clicked, this)); + _content_earlier->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FilmEditor::content_earlier_clicked, this)); + _content_later->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FilmEditor::content_later_clicked, this)); _content_timeline->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FilmEditor::content_timeline_clicked, this)); _scaler->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&FilmEditor::scaler_changed, this)); _dcp_content_type->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&FilmEditor::dcp_content_type_changed, this)); _frame_rate->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&FilmEditor::frame_rate_changed, this)); _best_frame_rate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FilmEditor::best_frame_rate_clicked, this)); + _signed->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&FilmEditor::signed_toggled, this)); + _encrypted->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&FilmEditor::encrypted_toggled, this)); _audio_channels->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&FilmEditor::audio_channels_changed, this)); _j2k_bandwidth->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&FilmEditor::j2k_bandwidth_changed, this)); _resolution->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&FilmEditor::resolution_changed, this)); _sequence_video->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&FilmEditor::sequence_video_changed, this)); _three_d->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&FilmEditor::three_d_changed, this)); + _standard->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&FilmEditor::standard_changed, this)); } void @@ -236,23 +262,29 @@ FilmEditor::make_content_panel () { wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - _content = new wxListCtrl (_content_panel, wxID_ANY, wxDefaultPosition, wxSize (320, 160), wxLC_REPORT | wxLC_NO_HEADER | wxLC_SINGLE_SEL); + _content = new wxListCtrl (_content_panel, wxID_ANY, wxDefaultPosition, wxSize (320, 160), wxLC_REPORT | wxLC_NO_HEADER); s->Add (_content, 1, wxEXPAND | wxTOP | wxBOTTOM, 6); _content->InsertColumn (0, wxT("")); _content->SetColumnWidth (0, 512); wxBoxSizer* b = new wxBoxSizer (wxVERTICAL); - _content_add = new wxButton (_content_panel, wxID_ANY, _("Add...")); - b->Add (_content_add, 1, wxEXPAND | wxLEFT | wxRIGHT); + _content_add_file = new wxButton (_content_panel, wxID_ANY, _("Add file(s)...")); + b->Add (_content_add_file, 1, wxEXPAND | wxLEFT | wxRIGHT); + _content_add_folder = new wxButton (_content_panel, wxID_ANY, _("Add folder...")); + b->Add (_content_add_folder, 1, wxEXPAND | wxLEFT | wxRIGHT); _content_remove = new wxButton (_content_panel, wxID_ANY, _("Remove")); b->Add (_content_remove, 1, wxEXPAND | wxLEFT | wxRIGHT); + _content_earlier = new wxButton (_content_panel, wxID_ANY, _("Up")); + b->Add (_content_earlier, 1, wxEXPAND); + _content_later = new wxButton (_content_panel, wxID_ANY, _("Down")); + b->Add (_content_later, 1, wxEXPAND); _content_timeline = new wxButton (_content_panel, wxID_ANY, _("Timeline...")); b->Add (_content_timeline, 1, wxEXPAND | wxLEFT | wxRIGHT); s->Add (b, 0, wxALL, 4); - _content_sizer->Add (s, 0.75, wxEXPAND | wxALL, 6); + _content_sizer->Add (s, 0, wxEXPAND | wxALL, 6); } _sequence_video = new wxCheckBox (_content_panel, wxID_ANY, _("Keep video in sequence")); @@ -289,9 +321,30 @@ FilmEditor::j2k_bandwidth_changed () return; } - _film->set_j2k_bandwidth (_j2k_bandwidth->GetValue() * 1e6); + _film->set_j2k_bandwidth (_j2k_bandwidth->GetValue() * 1000000); } +void +FilmEditor::signed_toggled () +{ + if (!_film) { + return; + } + + _film->set_signed (_signed->GetValue ()); +} + +void +FilmEditor::encrypted_toggled () +{ + if (!_film) { + return; + } + + _film->set_encrypted (_encrypted->GetValue ()); +} + +/** Called when the name widget has been changed */ void FilmEditor::frame_rate_changed () { @@ -326,6 +379,15 @@ FilmEditor::resolution_changed () _film->set_resolution (_resolution->GetSelection() == 0 ? RESOLUTION_2K : RESOLUTION_4K); } +void +FilmEditor::standard_changed () +{ + if (!_film) { + return; + } + + _film->set_interop (_standard->GetSelection() == 1); +} /** Called when the metadata stored in the Film object has changed; * so that we can update the GUI. @@ -369,12 +431,24 @@ FilmEditor::film_changed (Film::Property p) case Film::SCALER: checked_set (_scaler, Scaler::as_index (_film->scaler ())); break; + case Film::SIGNED: + checked_set (_signed, _film->is_signed ()); + break; + case Film::ENCRYPTED: + checked_set (_encrypted, _film->encrypted ()); + if (_film->encrypted ()) { + _film->set_signed (true); + _signed->Enable (false); + } else { + _signed->Enable (_generally_sensitive); + } + break; case Film::RESOLUTION: checked_set (_resolution, _film->resolution() == RESOLUTION_2K ? 0 : 1); setup_dcp_name (); break; case Film::J2K_BANDWIDTH: - checked_set (_j2k_bandwidth, double (_film->j2k_bandwidth()) / 1e6); + checked_set (_j2k_bandwidth, _film->j2k_bandwidth() / 1000000); break; case Film::USE_DCI_NAME: checked_set (_use_dci_name, _film->use_dci_name ()); @@ -402,7 +476,7 @@ FilmEditor::film_changed (Film::Property p) break; } case Film::AUDIO_CHANNELS: - _audio_channels->SetValue (_film->audio_channels ()); + checked_set (_audio_channels, _film->audio_channels ()); setup_dcp_name (); break; case Film::SEQUENCE_VIDEO: @@ -412,11 +486,14 @@ FilmEditor::film_changed (Film::Property p) checked_set (_three_d, _film->three_d ()); setup_dcp_name (); break; + case Film::INTEROP: + checked_set (_standard, _film->interop() ? 1 : 0); + break; } } void -FilmEditor::film_content_changed (weak_ptr weak_content, int property) +FilmEditor::film_content_changed (int property) { ensure_ui_thread (); @@ -427,17 +504,14 @@ FilmEditor::film_content_changed (weak_ptr weak_content, int property) return; } - shared_ptr content = weak_content.lock (); - if (!content || content != selected_content ()) { - return; - } - for (list::iterator i = _panels.begin(); i != _panels.end(); ++i) { - (*i)->film_content_changed (content, property); + (*i)->film_content_changed (property); } if (property == FFmpegContentProperty::AUDIO_STREAM) { setup_dcp_name (); + } else if (property == ContentProperty::PATH) { + setup_content (); } } @@ -505,7 +579,7 @@ FilmEditor::set_film (shared_ptr f) if (_film) { _film->Changed.connect (bind (&FilmEditor::film_changed, this, _1)); - _film->ContentChanged.connect (bind (&FilmEditor::film_content_changed, this, _1, _2)); + _film->ContentChanged.connect (bind (&FilmEditor::film_content_changed, this, _2)); } if (_film) { @@ -522,12 +596,15 @@ FilmEditor::set_film (shared_ptr f) film_changed (Film::RESOLUTION); film_changed (Film::SCALER); film_changed (Film::WITH_SUBTITLES); + film_changed (Film::SIGNED); + film_changed (Film::ENCRYPTED); film_changed (Film::J2K_BANDWIDTH); film_changed (Film::DCI_METADATA); film_changed (Film::VIDEO_FRAME_RATE); film_changed (Film::AUDIO_CHANNELS); film_changed (Film::SEQUENCE_VIDEO); film_changed (Film::THREE_D); + film_changed (Film::INTEROP); if (!_film->content().empty ()) { set_selection (_film->content().front ()); @@ -546,10 +623,21 @@ FilmEditor::set_general_sensitivity (bool s) _use_dci_name->Enable (s); _edit_dci_button->Enable (s); _content->Enable (s); - _content_add->Enable (s); + _content_add_file->Enable (s); + _content_add_folder->Enable (s); _content_remove->Enable (s); + _content_earlier->Enable (s); + _content_later->Enable (s); _content_timeline->Enable (s); _dcp_content_type->Enable (s); + + bool si = s; + if (_film && _film->encrypted ()) { + si = false; + } + _signed->Enable (si); + + _encrypted->Enable (s); _frame_rate->Enable (s); _audio_channels->Enable (s); _j2k_bandwidth->Enable (s); @@ -559,6 +647,7 @@ FilmEditor::set_general_sensitivity (bool s) _resolution->Enable (s); _scaler->Enable (s); _three_d->Enable (s); + _standard->Enable (s); /* Set the panels in the content notebook */ for (list::iterator i = _panels.begin(); i != _panels.end(); ++i) { @@ -645,10 +734,22 @@ FilmEditor::setup_content () ContentList content = _film->content (); for (ContentList::iterator i = content.begin(); i != content.end(); ++i) { int const t = _content->GetItemCount (); - _content->InsertItem (t, std_to_wx ((*i)->summary ())); + bool const valid = (*i)->paths_valid (); + + string s = (*i)->summary (); + if (!valid) { + s = _("MISSING: ") + s; + } + + _content->InsertItem (t, std_to_wx (s)); + if ((*i)->summary() == selected_summary) { _content->SetItemState (t, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); } + + if (!valid) { + _content->SetItemTextColour (t, *wxRED); + } } if (selected_summary.empty () && !content.empty ()) { @@ -658,42 +759,55 @@ FilmEditor::setup_content () } void -FilmEditor::content_add_clicked () +FilmEditor::content_add_file_clicked () { - wxFileDialog* d = new wxFileDialog (this, _("Choose a file or files"), wxT (""), wxT (""), wxT ("*.*"), wxFD_MULTIPLE); + /* The wxFD_CHANGE_DIR here prevents a `could not set working directory' error 123 on Windows when using + non-Latin filenames or paths. + */ + wxFileDialog* d = new wxFileDialog (this, _("Choose a file or files"), wxT (""), wxT (""), wxT ("*.*"), wxFD_MULTIPLE | wxFD_CHANGE_DIR); int const r = d->ShowModal (); - d->Destroy (); if (r != wxID_OK) { + d->Destroy (); return; } wxArrayString paths; d->GetPaths (paths); - for (unsigned int i = 0; i < paths.GetCount(); ++i) { - boost::filesystem::path p (wx_to_std (paths[i])); + /* XXX: check for lots of files here and do something */ - shared_ptr c; + for (unsigned int i = 0; i < paths.GetCount(); ++i) { + _film->examine_and_add_content (content_factory (_film, wx_to_std (paths[i]))); + } - if (StillImageContent::valid_file (p)) { - c.reset (new StillImageContent (_film, p)); - } else if (SndfileContent::valid_file (p)) { - c.reset (new SndfileContent (_film, p)); - } else { - c.reset (new FFmpegContent (_film, p)); - } + d->Destroy (); +} - _film->examine_and_add_content (c); +void +FilmEditor::content_add_folder_clicked () +{ + wxDirDialog* d = new wxDirDialog (this, _("Choose a folder"), wxT (""), wxDD_DIR_MUST_EXIST); + int const r = d->ShowModal (); + d->Destroy (); + + if (r != wxID_OK) { + return; } + + _film->examine_and_add_content ( + shared_ptr ( + new ImageContent (_film, boost::filesystem::path (wx_to_std (d->GetPath ()))) + ) + ); } void FilmEditor::content_remove_clicked () { - shared_ptr c = selected_content (); - if (c) { - _film->remove_content (c); + ContentList c = selected_content (); + if (c.size() == 1) { + _film->remove_content (c.front ()); } content_selection_changed (); @@ -703,92 +817,115 @@ void FilmEditor::content_selection_changed () { setup_content_sensitivity (); - shared_ptr s = selected_content (); - /* All other sensitivity in content panels should be triggered by - one of these. - */ - film_content_changed (s, ContentProperty::START); - film_content_changed (s, ContentProperty::LENGTH); - film_content_changed (s, VideoContentProperty::VIDEO_CROP); - film_content_changed (s, VideoContentProperty::VIDEO_RATIO); - film_content_changed (s, VideoContentProperty::VIDEO_FRAME_TYPE); - film_content_changed (s, AudioContentProperty::AUDIO_GAIN); - film_content_changed (s, AudioContentProperty::AUDIO_DELAY); - film_content_changed (s, AudioContentProperty::AUDIO_MAPPING); - film_content_changed (s, FFmpegContentProperty::AUDIO_STREAM); - film_content_changed (s, FFmpegContentProperty::AUDIO_STREAMS); - film_content_changed (s, FFmpegContentProperty::SUBTITLE_STREAM); - film_content_changed (s, FFmpegContentProperty::SUBTITLE_STREAMS); - film_content_changed (s, FFmpegContentProperty::FILTERS); - film_content_changed (s, SubtitleContentProperty::SUBTITLE_OFFSET); - film_content_changed (s, SubtitleContentProperty::SUBTITLE_SCALE); + for (list::iterator i = _panels.begin(); i != _panels.end(); ++i) { + (*i)->content_selection_changed (); + } } /** Set up broad sensitivity based on the type of content that is selected */ void FilmEditor::setup_content_sensitivity () { - _content_add->Enable (_generally_sensitive); + _content_add_file->Enable (_generally_sensitive); + _content_add_folder->Enable (_generally_sensitive); - shared_ptr selection = selected_content (); + ContentList selection = selected_content (); + VideoContentList video_selection = selected_video_content (); + AudioContentList audio_selection = selected_audio_content (); - _content_remove->Enable (selection && _generally_sensitive); + _content_remove->Enable (selection.size() == 1 && _generally_sensitive); + _content_earlier->Enable (selection.size() == 1 && _generally_sensitive); + _content_later->Enable (selection.size() == 1 && _generally_sensitive); _content_timeline->Enable (_generally_sensitive); - _video_panel->Enable (selection && dynamic_pointer_cast (selection) && _generally_sensitive); - _audio_panel->Enable (selection && dynamic_pointer_cast (selection) && _generally_sensitive); - _subtitle_panel->Enable (selection && dynamic_pointer_cast (selection) && _generally_sensitive); - _timing_panel->Enable (selection && _generally_sensitive); + _video_panel->Enable (video_selection.size() > 0 && _generally_sensitive); + _audio_panel->Enable (audio_selection.size() > 0 && _generally_sensitive); + _subtitle_panel->Enable (selection.size() == 1 && dynamic_pointer_cast (selection.front()) && _generally_sensitive); + _timing_panel->Enable (selection.size() == 1 && _generally_sensitive); } -shared_ptr +ContentList FilmEditor::selected_content () { - int const s = _content->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - if (s == -1) { - return shared_ptr (); - } + ContentList sel; + long int s = -1; + while (1) { + s = _content->GetNextItem (s, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); + if (s == -1) { + break; + } - ContentList c = _film->content (); - if (s < 0 || size_t (s) >= c.size ()) { - return shared_ptr (); + if (s < int (_film->content().size ())) { + sel.push_back (_film->content()[s]); + } } - - return c[s]; + + return sel; } -shared_ptr +VideoContentList FilmEditor::selected_video_content () { - shared_ptr c = selected_content (); - if (!c) { - return shared_ptr (); + ContentList c = selected_content (); + VideoContentList vc; + + for (ContentList::iterator i = c.begin(); i != c.end(); ++i) { + shared_ptr t = dynamic_pointer_cast (*i); + if (t) { + vc.push_back (t); + } } - return dynamic_pointer_cast (c); + return vc; } -shared_ptr +AudioContentList FilmEditor::selected_audio_content () { - shared_ptr c = selected_content (); - if (!c) { - return shared_ptr (); + ContentList c = selected_content (); + AudioContentList ac; + + for (ContentList::iterator i = c.begin(); i != c.end(); ++i) { + shared_ptr t = dynamic_pointer_cast (*i); + if (t) { + ac.push_back (t); + } } - return dynamic_pointer_cast (c); + return ac; } -shared_ptr +SubtitleContentList FilmEditor::selected_subtitle_content () { - shared_ptr c = selected_content (); - if (!c) { - return shared_ptr (); + ContentList c = selected_content (); + SubtitleContentList sc; + + for (ContentList::iterator i = c.begin(); i != c.end(); ++i) { + shared_ptr t = dynamic_pointer_cast (*i); + if (t) { + sc.push_back (t); + } + } + + return sc; +} + +FFmpegContentList +FilmEditor::selected_ffmpeg_content () +{ + ContentList c = selected_content (); + FFmpegContentList sc; + + for (ContentList::iterator i = c.begin(); i != c.end(); ++i) { + shared_ptr t = dynamic_pointer_cast (*i); + if (t) { + sc.push_back (t); + } } - return dynamic_pointer_cast (c); + return sc; } void @@ -799,7 +936,7 @@ FilmEditor::content_timeline_clicked () _timeline_dialog = 0; } - _timeline_dialog = new TimelineDialog (this, _film); + _timeline_dialog = new DCPTimelineDialog (this, _film); _timeline_dialog->Show (); } @@ -829,9 +966,7 @@ FilmEditor::sequence_video_changed () void FilmEditor::content_right_click (wxListEvent& ev) { - ContentList cl; - cl.push_back (selected_content ()); - _menu.popup (cl, ev.GetPoint ()); + _menu.popup (_film, selected_content (), ev.GetPoint ()); } void @@ -843,3 +978,23 @@ FilmEditor::three_d_changed () _film->set_three_d (_three_d->GetValue ()); } + +void +FilmEditor::content_earlier_clicked () +{ + ContentList sel = selected_content (); + if (sel.size() == 1) { + _film->move_content_earlier (sel.front ()); + content_selection_changed (); + } +} + +void +FilmEditor::content_later_clicked () +{ + ContentList sel = selected_content (); + if (sel.size() == 1) { + _film->move_content_later (sel.front ()); + content_selection_changed (); + } +}