X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.cc;h=56b6973757e0f7be59a52f892060a4223b4123a9;hb=373f010a7f04add1f49169cbaa60cb7ae5f508d4;hp=3800774e2268927b4dfbc82df409270afa4eca98;hpb=71cb2c8b03be7a246567631c637347d871c9c82d;p=dcpomatic.git diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index 3800774e2..56b697375 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -37,6 +37,8 @@ #include "lib/ratio.h" #include "lib/config.h" #include "lib/still_image_content.h" +#include "lib/moving_image_content.h" +#include "lib/ffmpeg_content.h" #include "lib/sndfile_content.h" #include "lib/dcp_content_type.h" #include "lib/sound_processor.h" @@ -138,22 +140,30 @@ FilmEditor::make_dcp_panel () { add_label_to_grid_bag_sizer (grid, _dcp_panel, _("Frame Rate"), true, wxGBPosition (r, 0)); wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - _dcp_frame_rate = new wxChoice (_dcp_panel, wxID_ANY); - s->Add (_dcp_frame_rate, 1, wxALIGN_CENTER_VERTICAL); - _best_dcp_frame_rate = new wxButton (_dcp_panel, wxID_ANY, _("Use best")); - s->Add (_best_dcp_frame_rate, 1, wxALIGN_CENTER_VERTICAL | wxEXPAND); + _frame_rate = new wxChoice (_dcp_panel, wxID_ANY); + s->Add (_frame_rate, 1, wxALIGN_CENTER_VERTICAL); + _best_frame_rate = new wxButton (_dcp_panel, wxID_ANY, _("Use best")); + s->Add (_best_frame_rate, 1, wxALIGN_CENTER_VERTICAL | wxEXPAND); grid->Add (s, wxGBPosition (r, 1)); } ++r; + _encrypted = new wxCheckBox (_dcp_panel, wxID_ANY, wxT ("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)); - _dcp_audio_channels = new wxSpinCtrl (_dcp_panel, wxID_ANY); - grid->Add (_dcp_audio_channels, wxGBPosition (r, 1)); + _audio_channels = new wxSpinCtrl (_dcp_panel, wxID_ANY); + grid->Add (_audio_channels, wxGBPosition (r, 1)); + ++r; + + _three_d = new wxCheckBox (_dcp_panel, wxID_ANY, _("3D")); + grid->Add (_three_d, wxGBPosition (r, 0), wxGBSpan (1, 2)); ++r; add_label_to_grid_bag_sizer (grid, _dcp_panel, _("Resolution"), true, wxGBPosition (r, 0)); - _dcp_resolution = new wxChoice (_dcp_panel, wxID_ANY); - grid->Add (_dcp_resolution, wxGBPosition (r, 1)); + _resolution = new wxChoice (_dcp_panel, wxID_ANY); + grid->Add (_resolution, wxGBPosition (r, 1)); ++r; { @@ -166,6 +176,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); @@ -188,37 +203,43 @@ FilmEditor::make_dcp_panel () list const dfr = Config::instance()->allowed_dcp_frame_rates (); for (list::const_iterator i = dfr.begin(); i != dfr.end(); ++i) { - _dcp_frame_rate->Append (std_to_wx (boost::lexical_cast (*i))); + _frame_rate->Append (std_to_wx (boost::lexical_cast (*i))); } - _dcp_audio_channels->SetRange (0, MAX_AUDIO_CHANNELS); - _j2k_bandwidth->SetRange (50, 250); + _audio_channels->SetRange (0, MAX_AUDIO_CHANNELS); + _j2k_bandwidth->SetRange (1, 250); - _dcp_resolution->Append (_("2K")); - _dcp_resolution->Append (_("4K")); + _resolution->Append (_("2K")); + _resolution->Append (_("4K")); + + _standard->Append (_("SMPTE")); + _standard->Append (_("Interop")); } 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); - _container->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (FilmEditor::container_changed), 0, this); - _content->Connect (wxID_ANY, wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler (FilmEditor::content_selection_changed), 0, this); - _content->Connect (wxID_ANY, wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler (FilmEditor::content_selection_changed), 0, this); - _content->Connect (wxID_ANY, wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK,wxListEventHandler (FilmEditor::content_right_click), 0, this); - _content_add->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::content_add_clicked), 0, this); - _content_remove->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::content_remove_clicked), 0, this); - _content_timeline->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::content_timeline_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_frame_rate->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (FilmEditor::dcp_frame_rate_changed), 0, this); - _best_dcp_frame_rate->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (FilmEditor::best_dcp_frame_rate_clicked), 0, this); - _dcp_audio_channels->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::dcp_audio_channels_changed), 0, this); - _j2k_bandwidth->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (FilmEditor::j2k_bandwidth_changed), 0, this); - _dcp_resolution->Connect (wxID_ANY, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler (FilmEditor::dcp_resolution_changed), 0, this); - _sequence_video->Connect (wxID_ANY, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler (FilmEditor::sequence_video_changed), 0, this); + _name->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&FilmEditor::name_changed, this)); + _use_dci_name->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&FilmEditor::use_dci_name_toggled, this)); + _edit_dci_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FilmEditor::edit_dci_button_clicked, this)); + _container->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&FilmEditor::container_changed, this)); + _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_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_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)); + _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 @@ -238,8 +259,10 @@ FilmEditor::make_content_panel () _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_timeline = new wxButton (_content_panel, wxID_ANY, _("Timeline...")); @@ -268,7 +291,7 @@ FilmEditor::make_content_panel () /** Called when the name widget has been changed */ void -FilmEditor::name_changed (wxCommandEvent &) +FilmEditor::name_changed () { if (!_film) { return; @@ -278,7 +301,7 @@ FilmEditor::name_changed (wxCommandEvent &) } void -FilmEditor::j2k_bandwidth_changed (wxCommandEvent &) +FilmEditor::j2k_bandwidth_changed () { if (!_film) { return; @@ -288,39 +311,59 @@ FilmEditor::j2k_bandwidth_changed (wxCommandEvent &) } void -FilmEditor::dcp_frame_rate_changed (wxCommandEvent &) +FilmEditor::encrypted_toggled () +{ + if (!_film) { + return; + } + + _film->set_encrypted (_encrypted->GetValue ()); +} + +/** Called when the name widget has been changed */ +void +FilmEditor::frame_rate_changed () { if (!_film) { return; } - _film->set_dcp_video_frame_rate ( + _film->set_video_frame_rate ( boost::lexical_cast ( - wx_to_std (_dcp_frame_rate->GetString (_dcp_frame_rate->GetSelection ())) + wx_to_std (_frame_rate->GetString (_frame_rate->GetSelection ())) ) ); } void -FilmEditor::dcp_audio_channels_changed (wxCommandEvent &) +FilmEditor::audio_channels_changed () { if (!_film) { return; } - _film->set_dcp_audio_channels (_dcp_audio_channels->GetValue ()); + _film->set_audio_channels (_audio_channels->GetValue ()); } void -FilmEditor::dcp_resolution_changed (wxCommandEvent &) +FilmEditor::resolution_changed () { if (!_film) { return; } - _film->set_resolution (_dcp_resolution->GetSelection() == 0 ? RESOLUTION_2K : RESOLUTION_4K); + _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. @@ -364,8 +407,11 @@ FilmEditor::film_changed (Film::Property p) case Film::SCALER: checked_set (_scaler, Scaler::as_index (_film->scaler ())); break; + case Film::ENCRYPTED: + checked_set (_encrypted, _film->encrypted ()); + break; case Film::RESOLUTION: - checked_set (_dcp_resolution, _film->resolution() == RESOLUTION_2K ? 0 : 1); + checked_set (_resolution, _film->resolution() == RESOLUTION_2K ? 0 : 1); setup_dcp_name (); break; case Film::J2K_BANDWIDTH: @@ -378,31 +424,38 @@ FilmEditor::film_changed (Film::Property p) case Film::DCI_METADATA: setup_dcp_name (); break; - case Film::DCP_VIDEO_FRAME_RATE: + case Film::VIDEO_FRAME_RATE: { bool done = false; - for (unsigned int i = 0; i < _dcp_frame_rate->GetCount(); ++i) { - if (wx_to_std (_dcp_frame_rate->GetString(i)) == boost::lexical_cast (_film->dcp_video_frame_rate())) { - checked_set (_dcp_frame_rate, i); + for (unsigned int i = 0; i < _frame_rate->GetCount(); ++i) { + if (wx_to_std (_frame_rate->GetString(i)) == boost::lexical_cast (_film->video_frame_rate())) { + checked_set (_frame_rate, i); done = true; break; } } if (!done) { - checked_set (_dcp_frame_rate, -1); + checked_set (_frame_rate, -1); } - _best_dcp_frame_rate->Enable (_film->best_dcp_video_frame_rate () != _film->dcp_video_frame_rate ()); + _best_frame_rate->Enable (_film->best_video_frame_rate () != _film->video_frame_rate ()); break; } - case Film::DCP_AUDIO_CHANNELS: - _dcp_audio_channels->SetValue (_film->dcp_audio_channels ()); + case Film::AUDIO_CHANNELS: + _audio_channels->SetValue (_film->audio_channels ()); setup_dcp_name (); break; case Film::SEQUENCE_VIDEO: checked_set (_sequence_video, _film->sequence_video ()); break; + case Film::THREE_D: + checked_set (_three_d, _film->three_d ()); + setup_dcp_name (); + break; + case Film::INTEROP: + checked_set (_standard, _film->interop() ? 1 : 0); + break; } } @@ -454,7 +507,7 @@ FilmEditor::setup_container () /** Called when the container widget has been changed */ void -FilmEditor::container_changed (wxCommandEvent &) +FilmEditor::container_changed () { if (!_film) { return; @@ -470,7 +523,7 @@ FilmEditor::container_changed (wxCommandEvent &) /** Called when the DCP content type widget has been changed */ void -FilmEditor::dcp_content_type_changed (wxCommandEvent &) +FilmEditor::dcp_content_type_changed () { if (!_film) { return; @@ -513,18 +566,20 @@ FilmEditor::set_film (shared_ptr f) film_changed (Film::RESOLUTION); film_changed (Film::SCALER); film_changed (Film::WITH_SUBTITLES); + film_changed (Film::ENCRYPTED); film_changed (Film::J2K_BANDWIDTH); film_changed (Film::DCI_METADATA); - film_changed (Film::DCP_VIDEO_FRAME_RATE); - film_changed (Film::DCP_AUDIO_CHANNELS); + 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 ()); } - wxListEvent ev; - content_selection_changed (ev); + content_selection_changed (); } void @@ -537,18 +592,22 @@ 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_timeline->Enable (s); _dcp_content_type->Enable (s); - _dcp_frame_rate->Enable (s); - _dcp_audio_channels->Enable (s); + _encrypted->Enable (s); + _frame_rate->Enable (s); + _audio_channels->Enable (s); _j2k_bandwidth->Enable (s); _container->Enable (s); - _best_dcp_frame_rate->Enable (s && _film && _film->best_dcp_video_frame_rate () != _film->dcp_video_frame_rate ()); + _best_frame_rate->Enable (s && _film && _film->best_video_frame_rate () != _film->video_frame_rate ()); _sequence_video->Enable (s); - _dcp_resolution->Enable (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) { @@ -558,7 +617,7 @@ FilmEditor::set_general_sensitivity (bool s) /** Called when the scaler widget has been changed */ void -FilmEditor::scaler_changed (wxCommandEvent &) +FilmEditor::scaler_changed () { if (!_film) { return; @@ -571,7 +630,7 @@ FilmEditor::scaler_changed (wxCommandEvent &) } void -FilmEditor::use_dci_name_toggled (wxCommandEvent &) +FilmEditor::use_dci_name_toggled () { if (!_film) { return; @@ -581,7 +640,7 @@ FilmEditor::use_dci_name_toggled (wxCommandEvent &) } void -FilmEditor::edit_dci_button_clicked (wxCommandEvent &) +FilmEditor::edit_dci_button_clicked () { if (!_film) { return; @@ -612,13 +671,13 @@ FilmEditor::setup_dcp_name () } void -FilmEditor::best_dcp_frame_rate_clicked (wxCommandEvent &) +FilmEditor::best_frame_rate_clicked () { if (!_film) { return; } - _film->set_dcp_video_frame_rate (_film->best_dcp_video_frame_rate ()); + _film->set_video_frame_rate (_film->best_video_frame_rate ()); } void @@ -648,7 +707,7 @@ FilmEditor::setup_content () } void -FilmEditor::content_add_clicked (wxCommandEvent &) +FilmEditor::content_add_file_clicked () { wxFileDialog* d = new wxFileDialog (this, _("Choose a file or files"), wxT (""), wxT (""), wxT ("*.*"), wxFD_MULTIPLE); int const r = d->ShowModal (); @@ -661,12 +720,14 @@ FilmEditor::content_add_clicked (wxCommandEvent &) wxArrayString paths; d->GetPaths (paths); + /* XXX: check for lots of files here and do something */ + for (unsigned int i = 0; i < paths.GetCount(); ++i) { boost::filesystem::path p (wx_to_std (paths[i])); shared_ptr c; - if (StillImageContent::valid_file (p)) { + if (valid_image_file (p)) { c.reset (new StillImageContent (_film, p)); } else if (SndfileContent::valid_file (p)) { c.reset (new SndfileContent (_film, p)); @@ -679,19 +740,36 @@ FilmEditor::content_add_clicked (wxCommandEvent &) } void -FilmEditor::content_remove_clicked (wxCommandEvent &) +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 MovingImageContent (_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); } - wxListEvent ev; - content_selection_changed (ev); + content_selection_changed (); } void -FilmEditor::content_selection_changed (wxListEvent &) +FilmEditor::content_selection_changed () { setup_content_sensitivity (); shared_ptr s = selected_content (); @@ -699,10 +777,14 @@ FilmEditor::content_selection_changed (wxListEvent &) /* All other sensitivity in content panels should be triggered by one of these. */ - film_content_changed (s, ContentProperty::START); + film_content_changed (s, ContentProperty::POSITION); film_content_changed (s, ContentProperty::LENGTH); + film_content_changed (s, ContentProperty::TRIM_START); + film_content_changed (s, ContentProperty::TRIM_END); 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, VideoContentProperty::COLOUR_CONVERSION); film_content_changed (s, AudioContentProperty::AUDIO_GAIN); film_content_changed (s, AudioContentProperty::AUDIO_DELAY); film_content_changed (s, AudioContentProperty::AUDIO_MAPPING); @@ -719,7 +801,8 @@ FilmEditor::content_selection_changed (wxListEvent &) 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 (); @@ -782,7 +865,7 @@ FilmEditor::selected_subtitle_content () } void -FilmEditor::content_timeline_clicked (wxCommandEvent &) +FilmEditor::content_timeline_clicked () { if (_timeline_dialog) { _timeline_dialog->Destroy (); @@ -807,7 +890,7 @@ FilmEditor::set_selection (weak_ptr wc) } void -FilmEditor::sequence_video_changed (wxCommandEvent &) +FilmEditor::sequence_video_changed () { if (!_film) { return; @@ -823,3 +906,13 @@ FilmEditor::content_right_click (wxListEvent& ev) cl.push_back (selected_content ()); _menu.popup (cl, ev.GetPoint ()); } + +void +FilmEditor::three_d_changed () +{ + if (!_film) { + return; + } + + _film->set_three_d (_three_d->GetValue ()); +}