X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.cc;h=d0534f9c06f873accb754622412840d6149c035a;hb=888eedd469b461cd51a384518e075dbee9f6834f;hp=ca638d8ae638c387f4946322927438b2e21ede9f;hpb=efc8654faceec410649901ee534861904d11e432;p=dcpomatic.git diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index ca638d8ae..d0534f9c0 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -48,7 +48,7 @@ #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" @@ -125,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)); @@ -232,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)); @@ -275,25 +275,19 @@ FilmEditor::make_content_panel () _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 | wxALL, pad); + 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 | wxALL, pad); + 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 | wxALL, pad); + 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, pad); + 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, pad); + 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 | wxALL, pad); + b->Add (_content_timeline, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); s->Add (b, 0, wxALL, 4); @@ -474,11 +468,11 @@ 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: @@ -538,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 (); } } @@ -615,7 +611,7 @@ 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); @@ -625,7 +621,7 @@ FilmEditor::set_film (shared_ptr f) 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::SEQUENCE_VIDEO); @@ -646,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); @@ -697,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 (); } @@ -759,6 +755,8 @@ 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)->paths_valid (); @@ -767,7 +765,7 @@ FilmEditor::setup_content () if (!valid) { s = _("MISSING: ") + s; } - + _content->InsertItem (t, std_to_wx (s)); if ((*i)->summary() == selected_summary) { @@ -838,8 +836,8 @@ 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 (); @@ -866,30 +864,41 @@ 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; } if (s < int (_film->content().size ())) { - sel.push_back (_film->content()[s]); + sel.push_back (content[s]); } }