X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.cc;h=e2886b5f586a9138defe7901dd6b3167b7c8dede;hb=49e401f651ccf6c409fc84f57aa205f1920ef070;hp=9cf840614535a7847d774977d3cdb2d396039788;hpb=329de46d6fb600c1958678ec5d09ef21532130d5;p=dcpomatic.git diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index 9cf840614..e2886b5f5 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" @@ -46,10 +45,11 @@ #include "lib/playlist.h" #include "lib/content.h" #include "lib/content_factory.h" +#include "lib/safe_stringstream.h" #include "timecode.h" #include "wx_util.h" #include "film_editor.h" -#include "dci_metadata_dialog.h" +#include "isdcf_metadata_dialog.h" #include "timeline_dialog.h" #include "timing_panel.h" #include "subtitle_panel.h" @@ -58,7 +58,6 @@ using std::string; using std::cout; -using std::stringstream; using std::pair; using std::fixed; using std::setprecision; @@ -71,9 +70,9 @@ using boost::dynamic_pointer_cast; using boost::lexical_cast; /** @param f Film to edit */ -FilmEditor::FilmEditor (shared_ptr f, wxWindow* parent) +FilmEditor::FilmEditor (wxWindow* parent) : wxPanel (parent) - , _menu (f, this) + , _menu (this) , _generally_sensitive (true) , _timeline_dialog (0) { @@ -87,13 +86,15 @@ FilmEditor::FilmEditor (shared_ptr f, wxWindow* parent) make_dcp_panel (); _main_notebook->AddPage (_dcp_panel, _("DCP"), false); - set_film (f); connect_to_widgets (); JobManager::instance()->ActiveJobsChanged.connect ( bind (&FilmEditor::active_jobs_changed, this, _1) ); - + + Config::instance()->Changed.connect (boost::bind (&FilmEditor::config_changed, this)); + + set_film (shared_ptr ()); SetSizerAndFit (s); } @@ -124,10 +125,10 @@ FilmEditor::make_dcp_panel () flags |= wxALIGN_RIGHT; #endif - _use_dci_name = new wxCheckBox (_dcp_panel, wxID_ANY, _("Use DCI name")); - grid->Add (_use_dci_name, wxGBPosition (r, 0), wxDefaultSpan, flags); - _edit_dci_button = new wxButton (_dcp_panel, wxID_ANY, _("Details...")); - grid->Add (_edit_dci_button, wxGBPosition (r, 1), wxDefaultSpan); + _use_isdcf_name = new wxCheckBox (_dcp_panel, wxID_ANY, _("Use ISDCF name")); + grid->Add (_use_isdcf_name, wxGBPosition (r, 0), wxDefaultSpan, flags); + _edit_isdcf_button = new wxButton (_dcp_panel, wxID_ANY, _("Details...")); + grid->Add (_edit_isdcf_button, wxGBPosition (r, 1), wxDefaultSpan); ++r; add_label_to_grid_bag_sizer (grid, _dcp_panel, _("Container"), true, wxGBPosition (r, 0)); @@ -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")); @@ -223,8 +232,8 @@ void FilmEditor::connect_to_widgets () { _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)); + _use_isdcf_name->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&FilmEditor::use_isdcf_name_toggled, this)); + _edit_isdcf_button->Bind(wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&FilmEditor::edit_isdcf_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)); @@ -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)); @@ -266,21 +277,21 @@ FilmEditor::make_content_panel () 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, DCPOMATIC_BUTTON_STACK_GAP); _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, DCPOMATIC_BUTTON_STACK_GAP); _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, DCPOMATIC_BUTTON_STACK_GAP); + _content_earlier = new wxButton (_content_panel, wxID_ANY, _("Up")); + b->Add (_content_earlier, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); + _content_later = new wxButton (_content_panel, wxID_ANY, _("Down")); + b->Add (_content_later, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); _content_timeline = new wxButton (_content_panel, wxID_ANY, _("Timeline...")); - b->Add (_content_timeline, 1, wxEXPAND | wxLEFT | wxRIGHT); + b->Add (_content_timeline, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); 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 +331,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 +351,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 +361,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 () { @@ -388,7 +420,7 @@ FilmEditor::film_changed (Film::Property p) return; } - stringstream s; + SafeStringStream s; for (list::iterator i = _panels.begin(); i != _panels.end(); ++i) { (*i)->film_changed (p); @@ -417,8 +449,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); @@ -427,28 +468,30 @@ FilmEditor::film_changed (Film::Property p) case Film::J2K_BANDWIDTH: checked_set (_j2k_bandwidth, _film->j2k_bandwidth() / 1000000); break; - case Film::USE_DCI_NAME: - checked_set (_use_dci_name, _film->use_dci_name ()); + case Film::USE_ISDCF_NAME: + checked_set (_use_isdcf_name, _film->use_isdcf_name ()); setup_dcp_name (); break; - case Film::DCI_METADATA: + case Film::ISDCF_METADATA: setup_dcp_name (); break; 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; } @@ -489,6 +532,8 @@ FilmEditor::film_content_changed (int property) setup_dcp_name (); } else if (property == ContentProperty::PATH) { setup_content (); + } else if (property == ContentProperty::POSITION) { + setup_content (); } } @@ -566,19 +611,19 @@ FilmEditor::set_film (shared_ptr f) } film_changed (Film::NAME); - film_changed (Film::USE_DCI_NAME); + film_changed (Film::USE_ISDCF_NAME); film_changed (Film::CONTENT); film_changed (Film::DCP_CONTENT_TYPE); film_changed (Film::CONTAINER); 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::ISDCF_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); @@ -597,8 +642,8 @@ FilmEditor::set_general_sensitivity (bool s) /* Stuff in the Content / DCP tabs */ _name->Enable (s); - _use_dci_name->Enable (s); - _edit_dci_button->Enable (s); + _use_isdcf_name->Enable (s); + _edit_isdcf_button->Enable (s); _content->Enable (s); _content_add_file->Enable (s); _content_add_folder->Enable (s); @@ -607,8 +652,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); @@ -640,25 +693,25 @@ FilmEditor::scaler_changed () } void -FilmEditor::use_dci_name_toggled () +FilmEditor::use_isdcf_name_toggled () { if (!_film) { return; } - _film->set_use_dci_name (_use_dci_name->GetValue ()); + _film->set_use_isdcf_name (_use_isdcf_name->GetValue ()); } void -FilmEditor::edit_dci_button_clicked () +FilmEditor::edit_isdcf_button_clicked () { if (!_film) { return; } - DCIMetadataDialog* d = new DCIMetadataDialog (this, _film->dci_metadata ()); + ISDCFMetadataDialog* d = new ISDCFMetadataDialog (this, _film->isdcf_metadata ()); d->ShowModal (); - _film->set_dci_metadata (d->dci_metadata ()); + _film->set_isdcf_metadata (d->isdcf_metadata ()); d->Destroy (); } @@ -702,15 +755,17 @@ FilmEditor::setup_content () _content->DeleteAllItems (); ContentList content = _film->content (); + sort (content.begin(), content.end(), ContentSorter ()); + 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) { s = _("MISSING: ") + s; } - + _content->InsertItem (t, std_to_wx (s)); if ((*i)->summary() == selected_summary) { @@ -731,11 +786,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; } @@ -747,6 +805,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 @@ -760,19 +820,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 () { ContentList c = selected_content (); - if (c.size() == 1) { - _film->remove_content (c.front ()); + for (ContentList::iterator i = c.begin(); i != c.end(); ++i) { + _film->remove_content (*i); } content_selection_changed (); @@ -799,29 +864,42 @@ FilmEditor::setup_content_sensitivity () VideoContentList video_selection = selected_video_content (); AudioContentList audio_selection = selected_audio_content (); - _content_remove->Enable (selection.size() == 1 && _generally_sensitive); + _content_remove->Enable (!selection.empty() && _generally_sensitive); _content_earlier->Enable (selection.size() == 1 && _generally_sensitive); _content_later->Enable (selection.size() == 1 && _generally_sensitive); - _content_timeline->Enable (_generally_sensitive); + _content_timeline->Enable (!_film->content().empty() && _generally_sensitive); - _video_panel->Enable (video_selection.size() > 0 && _generally_sensitive); - _audio_panel->Enable (audio_selection.size() > 0 && _generally_sensitive); + _video_panel->Enable (!video_selection.empty() && _generally_sensitive); + _audio_panel->Enable (!audio_selection.empty() && _generally_sensitive); _subtitle_panel->Enable (selection.size() == 1 && dynamic_pointer_cast (selection.front()) && _generally_sensitive); - _timing_panel->Enable (selection.size() == 1 && _generally_sensitive); + _timing_panel->Enable (!selection.empty() && _generally_sensitive); } ContentList FilmEditor::selected_content () { ContentList sel; + + if (!_film) { + return sel; + } + + /* The list was populated using a sorted content list, so we must sort it here too + so that we can look up by index and get the right thing. + */ + ContentList content = _film->content (); + sort (content.begin(), content.end(), ContentSorter ()); + long int s = -1; - while (1) { + while (true) { s = _content->GetNextItem (s, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); if (s == -1) { break; } - sel.push_back (_film->content()[s]); + if (s < int (_film->content().size ())) { + sel.push_back (content[s]); + } } return sel; @@ -911,7 +989,7 @@ FilmEditor::set_selection (weak_ptr wc) if (content[i] == wc.lock ()) { _content->SetItemState (i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); } else { - _content->SetItemState (i, 0, wxLIST_STATE_SELECTED | wxLIST_STATE_FOCUSED); + _content->SetItemState (i, 0, wxLIST_STATE_SELECTED); } } } @@ -929,7 +1007,7 @@ FilmEditor::sequence_video_changed () void FilmEditor::content_right_click (wxListEvent& ev) { - _menu.popup (selected_content (), ev.GetPoint ()); + _menu.popup (_film, selected_content (), ev.GetPoint ()); } void @@ -961,3 +1039,24 @@ FilmEditor::content_later_clicked () 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 (); +}