X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.cc;h=c20a1232402f1b4f5bc337aa9b724219d40f3fb7;hb=308488324dbc4d8b709d3fb1dc9fee0479346c21;hp=b789a826695dbceac24f8df65220be4a0cacc1aa;hpb=31f7328d3f15729aa13881bb3582423c5a5fc27a;p=dcpomatic.git diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index b789a8266..c20a12324 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2013 Carl Hetherington + Copyright (C) 2012-2014 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -36,8 +36,7 @@ #include "lib/filter.h" #include "lib/ratio.h" #include "lib/config.h" -#include "lib/still_image_content.h" -#include "lib/moving_image_content.h" +#include "lib/image_content.h" #include "lib/ffmpeg_content.h" #include "lib/sndfile_content.h" #include "lib/dcp_content_type.h" @@ -73,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) { @@ -93,6 +92,8 @@ FilmEditor::FilmEditor (shared_ptr f, wxWindow* parent) JobManager::instance()->ActiveJobsChanged.connect ( bind (&FilmEditor::active_jobs_changed, this, _1) ); + + Config::instance()->Changed.connect (boost::bind (&FilmEditor::config_changed, this)); SetSizerAndFit (s); } @@ -142,16 +143,23 @@ FilmEditor::make_dcp_panel () { add_label_to_grid_bag_sizer (grid, _dcp_panel, _("Frame Rate"), true, wxGBPosition (r, 0)); - wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - _frame_rate = new wxChoice (_dcp_panel, wxID_ANY); - s->Add (_frame_rate, 1, wxALIGN_CENTER_VERTICAL); + _frame_rate_sizer = new wxBoxSizer (wxHORIZONTAL); + _frame_rate_choice = new wxChoice (_dcp_panel, wxID_ANY); + _frame_rate_sizer->Add (_frame_rate_choice, 1, wxALIGN_CENTER_VERTICAL); + _frame_rate_spin = new wxSpinCtrl (_dcp_panel, wxID_ANY); + _frame_rate_sizer->Add (_frame_rate_spin, 1, wxALIGN_CENTER_VERTICAL); + setup_frame_rate_widget (); _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)); + _frame_rate_sizer->Add (_best_frame_rate, 1, wxALIGN_CENTER_VERTICAL | wxEXPAND); + grid->Add (_frame_rate_sizer, wxGBPosition (r, 1)); } ++r; - _encrypted = new wxCheckBox (_dcp_panel, wxID_ANY, wxT ("Encrypted")); + _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; @@ -174,7 +182,7 @@ FilmEditor::make_dcp_panel () wxSizer* s = new wxBoxSizer (wxHORIZONTAL); _j2k_bandwidth = new wxSpinCtrl (_dcp_panel, wxID_ANY); s->Add (_j2k_bandwidth, 1); - add_label_to_sizer (s, _dcp_panel, _("MBps"), false); + add_label_to_sizer (s, _dcp_panel, _("Mbit/s"), false); grid->Add (s, wxGBPosition (r, 1)); } ++r; @@ -206,11 +214,12 @@ FilmEditor::make_dcp_panel () list const dfr = Config::instance()->allowed_dcp_frame_rates (); for (list::const_iterator i = dfr.begin(); i != dfr.end(); ++i) { - _frame_rate->Append (std_to_wx (boost::lexical_cast (*i))); + _frame_rate_choice->Append (std_to_wx (boost::lexical_cast (*i))); } - _audio_channels->SetRange (0, MAX_AUDIO_CHANNELS); - _j2k_bandwidth->SetRange (1, 250); + _audio_channels->SetRange (0, MAX_DCP_AUDIO_CHANNELS); + _j2k_bandwidth->SetRange (1, Config::instance()->maximum_j2k_bandwidth() / 1000000); + _frame_rate_spin->SetRange (1, 480); _resolution->Append (_("2K")); _resolution->Append (_("4K")); @@ -237,8 +246,10 @@ FilmEditor::connect_to_widgets () _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)); + _frame_rate_choice->Bind(wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&FilmEditor::frame_rate_choice_changed, this)); + _frame_rate_spin->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&FilmEditor::frame_rate_spin_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)); @@ -258,29 +269,35 @@ 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); +#ifdef DCPOMATIC_OSX + int const pad = 2; +#else + int const pad = 0; +#endif + wxBoxSizer* b = new wxBoxSizer (wxVERTICAL); _content_add_file = new wxButton (_content_panel, wxID_ANY, _("Add file(s)...")); - b->Add (_content_add_file, 1, wxEXPAND | wxLEFT | wxRIGHT); + b->Add (_content_add_file, 1, wxEXPAND | wxALL, pad); _content_add_folder = new wxButton (_content_panel, wxID_ANY, _("Add folder...")); - b->Add (_content_add_folder, 1, wxEXPAND | wxLEFT | wxRIGHT); + b->Add (_content_add_folder, 1, wxEXPAND | wxALL, pad); _content_remove = new wxButton (_content_panel, wxID_ANY, _("Remove")); - b->Add (_content_remove, 1, wxEXPAND | wxLEFT | wxRIGHT); - _content_earlier = new wxButton (_content_panel, wxID_UP); - b->Add (_content_earlier, 1, wxEXPAND); - _content_later = new wxButton (_content_panel, wxID_DOWN); - b->Add (_content_later, 1, wxEXPAND); + b->Add (_content_remove, 1, wxEXPAND | wxALL, pad); + _content_earlier = new wxButton (_content_panel, wxID_ANY, _("Up")); + b->Add (_content_earlier, 1, wxEXPAND | wxALL, pad); + _content_later = new wxButton (_content_panel, wxID_ANY, _("Down")); + b->Add (_content_later, 1, wxEXPAND | wxALL, pad); _content_timeline = new wxButton (_content_panel, wxID_ANY, _("Timeline...")); - b->Add (_content_timeline, 1, wxEXPAND | wxLEFT | wxRIGHT); + b->Add (_content_timeline, 1, wxEXPAND | wxALL, pad); 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")); @@ -320,6 +337,16 @@ FilmEditor::j2k_bandwidth_changed () _film->set_j2k_bandwidth (_j2k_bandwidth->GetValue() * 1000000); } +void +FilmEditor::signed_toggled () +{ + if (!_film) { + return; + } + + _film->set_signed (_signed->GetValue ()); +} + void FilmEditor::encrypted_toggled () { @@ -330,9 +357,9 @@ FilmEditor::encrypted_toggled () _film->set_encrypted (_encrypted->GetValue ()); } -/** Called when the name widget has been changed */ +/** Called when the frame rate choice widget has been changed */ void -FilmEditor::frame_rate_changed () +FilmEditor::frame_rate_choice_changed () { if (!_film) { return; @@ -340,11 +367,22 @@ FilmEditor::frame_rate_changed () _film->set_video_frame_rate ( boost::lexical_cast ( - wx_to_std (_frame_rate->GetString (_frame_rate->GetSelection ())) + wx_to_std (_frame_rate_choice->GetString (_frame_rate_choice->GetSelection ())) ) ); } +/** Called when the frame rate spin widget has been changed */ +void +FilmEditor::frame_rate_spin_changed () +{ + if (!_film) { + return; + } + + _film->set_video_frame_rate (_frame_rate_spin->GetValue ()); +} + void FilmEditor::audio_channels_changed () { @@ -417,8 +455,17 @@ 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); @@ -437,18 +484,20 @@ FilmEditor::film_changed (Film::Property p) case Film::VIDEO_FRAME_RATE: { bool done = false; - 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); + for (unsigned int i = 0; i < _frame_rate_choice->GetCount(); ++i) { + if (wx_to_std (_frame_rate_choice->GetString(i)) == boost::lexical_cast (_film->video_frame_rate())) { + checked_set (_frame_rate_choice, i); done = true; break; } } if (!done) { - checked_set (_frame_rate, -1); + checked_set (_frame_rate_choice, -1); } + _frame_rate_spin->SetValue (_film->video_frame_rate ()); + _best_frame_rate->Enable (_film->best_video_frame_rate () != _film->video_frame_rate ()); break; } @@ -470,7 +519,7 @@ FilmEditor::film_changed (Film::Property p) } void -FilmEditor::film_content_changed (weak_ptr weak_content, int property) +FilmEditor::film_content_changed (int property) { ensure_ui_thread (); @@ -481,13 +530,8 @@ 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) { @@ -561,7 +605,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) { @@ -578,12 +622,12 @@ 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::ENCRYPTED); film_changed (Film::SEQUENCE_VIDEO); film_changed (Film::THREE_D); film_changed (Film::INTEROP); @@ -612,8 +656,16 @@ FilmEditor::set_general_sensitivity (bool 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); + _frame_rate_choice->Enable (s); + _frame_rate_spin->Enable (s); _audio_channels->Enable (s); _j2k_bandwidth->Enable (s); _container->Enable (s); @@ -709,7 +761,7 @@ FilmEditor::setup_content () ContentList content = _film->content (); for (ContentList::iterator i = content.begin(); i != content.end(); ++i) { int const t = _content->GetItemCount (); - bool const valid = (*i)->path_valid (); + bool const valid = (*i)->paths_valid (); string s = (*i)->summary (); if (!valid) { @@ -736,11 +788,14 @@ FilmEditor::setup_content () void 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; } @@ -752,6 +807,8 @@ FilmEditor::content_add_file_clicked () for (unsigned int i = 0; i < paths.GetCount(); ++i) { _film->examine_and_add_content (content_factory (_film, wx_to_std (paths[i]))); } + + d->Destroy (); } void @@ -765,19 +822,24 @@ FilmEditor::content_add_folder_clicked () return; } - _film->examine_and_add_content ( - shared_ptr ( - new MovingImageContent (_film, boost::filesystem::path (wx_to_std (d->GetPath ()))) - ) - ); + shared_ptr ic; + + try { + ic.reset (new ImageContent (_film, boost::filesystem::path (wx_to_std (d->GetPath ())))); + } catch (FileError& e) { + error_dialog (this, std_to_wx (e.what ())); + return; + } + + _film->examine_and_add_content (ic); } 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 (); @@ -787,29 +849,10 @@ 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::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); - 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 */ @@ -819,66 +862,102 @@ FilmEditor::setup_content_sensitivity () _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_earlier->Enable (selection && _generally_sensitive); - _content_later->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 dynamic_pointer_cast (c); + 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 sc; } void @@ -919,11 +998,7 @@ FilmEditor::sequence_video_changed () void FilmEditor::content_right_click (wxListEvent& ev) { - ContentList cl; - if (selected_content ()) { - cl.push_back (selected_content ()); - } - _menu.popup (cl, ev.GetPoint ()); + _menu.popup (_film, selected_content (), ev.GetPoint ()); } void @@ -939,13 +1014,40 @@ FilmEditor::three_d_changed () void FilmEditor::content_earlier_clicked () { - _film->move_content_earlier (selected_content ()); - content_selection_changed (); + ContentList sel = selected_content (); + if (sel.size() == 1) { + _film->move_content_earlier (sel.front ()); + content_selection_changed (); + } } void FilmEditor::content_later_clicked () { - _film->move_content_later (selected_content ()); - content_selection_changed (); + ContentList sel = selected_content (); + if (sel.size() == 1) { + _film->move_content_later (sel.front ()); + content_selection_changed (); + } +} + +void +FilmEditor::config_changed () +{ + _j2k_bandwidth->SetRange (1, Config::instance()->maximum_j2k_bandwidth() / 1000000); + setup_frame_rate_widget (); +} + +void +FilmEditor::setup_frame_rate_widget () +{ + if (Config::instance()->allow_any_dcp_frame_rate ()) { + _frame_rate_choice->Hide (); + _frame_rate_spin->Show (); + } else { + _frame_rate_choice->Show (); + _frame_rate_spin->Hide (); + } + + _frame_rate_sizer->Layout (); }