X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.cc;h=9e73900fcf012efd41e30502e27509553aae74ae;hb=HEAD;hp=456dbcb56db8f1980f890dbfba07408ff482996c;hpb=fe851f2e6e57d3a8781ecc173089c19632c521e3;p=dcpomatic.git diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index 456dbcb56..9e73900fc 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -30,7 +30,6 @@ #include "timeline_dialog.h" #include "timing_panel.h" #include "video_panel.h" -#include "wx_ptr.h" #include "wx_util.h" #include "lib/audio_content.h" #include "lib/case_insensitive_sorter.h" @@ -43,6 +42,8 @@ #include "lib/dcp_subtitle_decoder.h" #include "lib/dcpomatic_log.h" #include "lib/ffmpeg_content.h" +#include "lib/film.h" +#include "lib/film_util.h" #include "lib/image_content.h" #include "lib/log.h" #include "lib/playlist.h" @@ -50,6 +51,8 @@ #include "lib/string_text_file_content.h" #include "lib/text_content.h" #include "lib/video_content.h" +#include +#include #include LIBDCP_DISABLE_WARNINGS #include @@ -151,9 +154,9 @@ public: vector folders; for (size_t i = 0; i < filenames.GetCount(); ++i) { auto path = boost::filesystem::path(wx_to_std(filenames[i])); - if (boost::filesystem::is_regular_file(path)) { + if (dcp::filesystem::is_regular_file(path)) { files.push_back(path); - } else if (boost::filesystem::is_directory(path)) { + } else if (dcp::filesystem::is_directory(path)) { if (contains_assetmap(path)) { dcps.push_back(path); } else { @@ -195,6 +198,7 @@ public: struct Item { wxString text; + weak_ptr content; bool error; }; @@ -217,6 +221,14 @@ public: return _items[item].error ? const_cast(&_red) : nullptr; } + weak_ptr content_at_index(long index) + { + if (index < 0 || index >= static_cast(_items.size())) { + return {}; + } + return _items[index].content; + } + private: std::vector _items; wxListItemAttr _red; @@ -249,7 +261,7 @@ ContentPanel::ContentPanel(wxNotebook* n, shared_ptr film, FilmViewer& vie auto b = new wxBoxSizer (wxVERTICAL); _add_file = new Button (_top_panel, _("Add file(s)...")); - _add_file->SetToolTip (_("Add video, image, sound or subtitle files to the film.")); + _add_file->SetToolTip(_("Add video, image, sound or subtitle files to the film (Ctrl+A).")); b->Add (_add_file, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); _add_folder = new Button (_top_panel, _("Add folder...")); @@ -261,7 +273,7 @@ ContentPanel::ContentPanel(wxNotebook* n, shared_ptr film, FilmViewer& vie b->Add (_add_dcp, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); _remove = new Button (_top_panel, _("Remove")); - _remove->SetToolTip (_("Remove the selected piece of content from the film.")); + _remove->SetToolTip(_("Remove the selected piece of content from the film (Delete).")); b->Add (_remove, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); _earlier = new Button (_top_panel, _("Earlier")); @@ -273,7 +285,7 @@ ContentPanel::ContentPanel(wxNotebook* n, shared_ptr film, FilmViewer& vie b->Add (_later, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); _timeline = new Button (_top_panel, _("Timeline...")); - _timeline->SetToolTip (_("Open the timeline for the film.")); + _timeline->SetToolTip(_("Open the timeline for the film (Ctrl+T).")); b->Add (_timeline, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); s->Add (b, 0, wxALL, 4); @@ -320,9 +332,9 @@ ContentPanel::selected () break; } - auto cl = _film->content(); - if (s < int (cl.size())) { - sel.push_back (cl[s]); + auto weak = _content->content_at_index(s); + if (auto content = weak.lock()) { + sel.push_back(content); } } @@ -392,11 +404,11 @@ ContentPanel::selected_ffmpeg () void -ContentPanel::film_changed (Film::Property p) +ContentPanel::film_changed(FilmProperty p) { switch (p) { - case Film::Property::CONTENT: - case Film::Property::CONTENT_ORDER: + case FilmProperty::CONTENT: + case FilmProperty::CONTENT_ORDER: setup (); break; default: @@ -518,7 +530,7 @@ ContentPanel::check_selection () _video_panel->create (); } else if (!have_video && _video_panel) { _notebook->DeletePage (off); - _video_panel = 0; + _video_panel = nullptr; } if (have_video) { @@ -531,7 +543,7 @@ ContentPanel::check_selection () _audio_panel->create (); } else if (!have_audio && _audio_panel) { _notebook->DeletePage (off); - _audio_panel = 0; + _audio_panel = nullptr; } if (have_audio) { @@ -571,17 +583,6 @@ ContentPanel::check_selection () } -optional -ContentPanel::add_files_override_path() const -{ - DCPOMATIC_ASSERT(_film->directory()); - return Config::instance()->default_add_file_location() == Config::DefaultAddFileLocation::SAME_AS_PROJECT - ? _film->directory()->parent_path() - : boost::optional(); - -} - - void ContentPanel::add_file_clicked () { @@ -595,17 +596,18 @@ ContentPanel::add_file_clicked () /* The wxFD_CHANGE_DIR here prevents a `could not set working directory' error 123 on Windows when using non-Latin filenames or paths. */ - auto dialog = make_wx( + FileDialog dialog( _splitter, _("Choose a file or files"), wxT("All files|*.*|Subtitle files|*.srt;*.xml|Audio files|*.wav;*.w64;*.flac;*.aif;*.aiff"), wxFD_MULTIPLE | wxFD_CHANGE_DIR, "AddFilesPath", - add_files_override_path() + {}, + add_files_override_path(_film) ); - if (dialog->show()) { - add_files(dialog->paths()); + if (dialog.show()) { + add_files(dialog.paths()); } } @@ -613,9 +615,9 @@ ContentPanel::add_file_clicked () void ContentPanel::add_folder_clicked () { - auto d = make_wx(_splitter, _("Choose a folder"), wxDD_DIR_MUST_EXIST, "AddFilesPath", add_files_override_path()); - if (d->show()) { - add_folder(d->path()); + DirDialog dialog(_splitter, _("Choose a folder"), wxDD_DIR_MUST_EXIST, "AddFilesPath", add_files_override_path(_film)); + if (dialog.show()) { + add_folder(dialog.path()); } } @@ -640,12 +642,12 @@ ContentPanel::add_folder(boost::filesystem::path folder) for (auto i: content) { auto ic = dynamic_pointer_cast (i); if (ic) { - auto e = make_wx(_splitter); + ImageSequenceDialog dialog(_splitter); - if (e->ShowModal() != wxID_OK) { + if (dialog.ShowModal() != wxID_OK) { return; } - ic->set_video_frame_rate(_film, e->frame_rate()); + ic->set_video_frame_rate(_film, dialog.frame_rate()); } _film->examine_and_add_content (i); @@ -656,9 +658,9 @@ ContentPanel::add_folder(boost::filesystem::path folder) void ContentPanel::add_dcp_clicked () { - auto d = make_wx(_splitter, _("Choose a DCP folder"), wxDD_DIR_MUST_EXIST, "AddFilesPath", add_files_override_path()); - if (d->show()) { - add_dcp(d->path()); + DirDialog dialog(_splitter, _("Choose a DCP folder"), wxDD_DIR_MUST_EXIST, "AddFilesPath", add_files_override_path(_film)); + if (dialog.show()) { + add_dcp(dialog.path()); } } @@ -705,7 +707,7 @@ ContentPanel::remove_clicked (bool hotkey) void ContentPanel::timeline_clicked () { - if (!_film) { + if (!_film || _film->content().empty()) { return; } @@ -763,8 +765,8 @@ ContentPanel::set_film (shared_ptr film) _film = film; - film_changed (Film::Property::CONTENT); - film_changed (Film::Property::AUDIO_CHANNELS); + film_changed(FilmProperty::CONTENT); + film_changed(FilmProperty::AUDIO_CHANNELS); if (_film) { check_selection (); @@ -817,14 +819,16 @@ ContentPanel::set_selection (weak_ptr wc) void ContentPanel::set_selection (ContentList cl) { - _no_check_selection = true; + { + _no_check_selection = true; + dcp::ScopeGuard sg = [this]() { _no_check_selection = false; }; - auto content = _film->content (); - for (size_t i = 0; i < content.size(); ++i) { - set_selected_state(i, find(cl.begin(), cl.end(), content[i]) != cl.end()); + auto content = _film->content (); + for (size_t i = 0; i < content.size(); ++i) { + set_selected_state(i, find(cl.begin(), cl.end(), content[i]) != cl.end()); + } } - _no_check_selection = false; check_selection (); } @@ -865,21 +869,11 @@ ContentPanel::setup () } auto content = _film->content (); - - Content* selected_content = nullptr; - auto const s = _content->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); - if (s != -1) { - wxListItem item; - item.SetId (s); - item.SetMask (wxLIST_MASK_DATA); - _content->GetItem (item); - selected_content = reinterpret_cast (item.GetData ()); - } + auto selection = selected(); vector items; for (auto i: content) { - int const t = _content->GetItemCount (); bool const valid = i->paths_valid (); auto dcp = dynamic_pointer_cast (i); @@ -900,18 +894,15 @@ ContentPanel::setup () s = _("NEEDS OV: ") + s; } - items.push_back({s, !valid || needs_kdm || needs_assets}); - - if (i.get() == selected_content) { - set_selected_state(t, true); - } + items.push_back({s, i, !valid || needs_kdm || needs_assets}); } _content->set(items); - if (!selected_content && !content.empty ()) { - /* Select the item of content if none was selected before */ + if (selection.empty() && !content.empty()) { set_selected_state(0, true); + } else { + set_selection(selection); } setup_sensitivity ();