X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.cc;h=07d2e142acfe456363ef33a16643e246f6fca84a;hb=8ca87754c90cfe02c45eda7cb51b8caa3caeefef;hp=5bc006e12318a5fcc7af505633baa8907271aefa;hpb=940812b93bade4ac8fd41ee4fb29f3f799815b83;p=dcpomatic.git diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index 5bc006e12..07d2e142a 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -21,7 +21,11 @@ #include "audio_panel.h" #include "content_panel.h" +#include "content_panel.h" +#include "cucumber_bridge.h" +#include "cucumber_registry.h" #include "dcpomatic_button.h" +#include "dir_dialog.h" #include "file_dialog.h" #include "film_viewer.h" #include "image_sequence_dialog.h" @@ -29,6 +33,8 @@ #include "timeline_dialog.h" #include "timing_panel.h" #include "video_panel.h" +#include "video_panel.h" +#include "wx_util.h" #include "wx_util.h" #include "lib/audio_content.h" #include "lib/case_insensitive_sorter.h" @@ -41,6 +47,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" @@ -49,6 +57,7 @@ #include "lib/string_text_file_content.h" #include "lib/text_content.h" #include "lib/video_content.h" +#include #include LIBDCP_DISABLE_WARNINGS #include @@ -150,9 +159,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 { @@ -194,6 +203,7 @@ public: struct Item { wxString text; + weak_ptr content; bool error; }; @@ -216,6 +226,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; @@ -248,7 +266,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...")); @@ -260,7 +278,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")); @@ -272,7 +290,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); @@ -319,9 +337,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); } } @@ -391,11 +409,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: @@ -517,7 +535,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) { @@ -530,7 +548,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) { @@ -583,18 +601,17 @@ 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 = new FileDialog( + 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" + "AddFilesPath", + add_files_override_path(_film) ); - ScopeGuard sg = [dialog]() { dialog->Destroy(); }; - - if (dialog->show()) { - add_files(dialog->paths()); + if (dialog.show()) { + add_files(dialog.paths()); } } @@ -602,17 +619,10 @@ ContentPanel::add_file_clicked () void ContentPanel::add_folder_clicked () { - auto const initial_path = Config::instance()->initial_path("AddFilesPath"); - - auto d = new wxDirDialog(_splitter, _("Choose a folder"), std_to_wx(initial_path ? initial_path->string() : home_directory().string()), wxDD_DIR_MUST_EXIST); - ScopeGuard sg = [d]() { d->Destroy(); }; - int r = d->ShowModal (); - if (r != wxID_OK) { - return; + DirDialog dialog(_splitter, _("Choose a folder"), wxDD_DIR_MUST_EXIST, "AddFilesPath", add_files_override_path(_film)); + if (dialog.show()) { + add_folder(dialog.path()); } - - boost::filesystem::path const path(wx_to_std(d->GetPath())); - add_folder(path); } @@ -636,13 +646,12 @@ ContentPanel::add_folder(boost::filesystem::path folder) for (auto i: content) { auto ic = dynamic_pointer_cast (i); if (ic) { - auto e = new ImageSequenceDialog (_splitter); - ScopeGuard sg = [e]() { e->Destroy(); }; + 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); @@ -653,17 +662,10 @@ ContentPanel::add_folder(boost::filesystem::path folder) void ContentPanel::add_dcp_clicked () { - auto const initial_path = Config::instance()->initial_path("AddFilesPath"); - - auto d = new wxDirDialog(_splitter, _("Choose a DCP folder"), std_to_wx(initial_path ? initial_path->string() : home_directory().string()), wxDD_DIR_MUST_EXIST); - ScopeGuard sg = [d]() { d->Destroy(); }; - int r = d->ShowModal (); - if (r != wxID_OK) { - return; + DirDialog dialog(_splitter, _("Choose a DCP folder"), wxDD_DIR_MUST_EXIST, "AddFilesPath", add_files_override_path(_film)); + if (dialog.show()) { + add_dcp(dialog.path()); } - - boost::filesystem::path const path(wx_to_std(d->GetPath())); - add_dcp(path); } @@ -709,16 +711,11 @@ ContentPanel::remove_clicked (bool hotkey) void ContentPanel::timeline_clicked () { - if (!_film) { + if (!_film || _film->content().empty()) { return; } - if (_timeline_dialog) { - _timeline_dialog->Destroy (); - _timeline_dialog = nullptr; - } - - _timeline_dialog = new TimelineDialog (this, _film, _film_viewer); + _timeline_dialog.reset(this, _film, _film_viewer); _timeline_dialog->set_selection (selected()); _timeline_dialog->Show (); } @@ -772,8 +769,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 (); @@ -826,14 +823,16 @@ ContentPanel::set_selection (weak_ptr wc) void ContentPanel::set_selection (ContentList cl) { - _no_check_selection = true; + { + _no_check_selection = true; + 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 (); } @@ -864,6 +863,36 @@ ContentPanel::film_content_changed (int property) } +static +wxString +text_for_content(shared_ptr content, bool& alert) +{ + bool const valid = content->paths_valid(); + + auto dcp = dynamic_pointer_cast(content); + bool const needs_kdm = dcp && dcp->needs_kdm(); + bool const needs_assets = dcp && dcp->needs_assets(); + + auto s = std_to_wx(content->summary()); + + if (!valid) { + s = _("MISSING: ") + s; + } + + if (needs_kdm) { + s = _("NEEDS KDM: ") + s; + } + + if (needs_assets) { + s = _("NEEDS OV: ") + s; + } + + alert = !valid || needs_kdm || needs_assets; + + return s; +} + + void ContentPanel::setup () { @@ -874,53 +903,37 @@ 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); - bool const needs_kdm = dcp && dcp->needs_kdm (); - bool const needs_assets = dcp && dcp->needs_assets (); + bool alert = false; + wxString const s = text_for_content(i, alert); + items.push_back({s, i, alert}); - auto s = std_to_wx (i->summary ()); - - if (!valid) { - s = _("MISSING: ") + s; - } - - if (needs_kdm) { - s = _("NEEDS KDM: ") + s; - } + wxListItem item; + item.SetId (t); + item.SetText (s); + item.SetData (i.get ()); + _content->InsertItem (item); - if (needs_assets) { - s = _("NEEDS OV: ") + s; + if (i.get() == selected_content) { + _content->SetItemState (t, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); } - items.push_back({s, !valid || needs_kdm || needs_assets}); - - if (i.get() == selected_content) { - set_selected_state(t, true); + if (alert) { + _content->SetItemTextColour (t, *wxRED); } } _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 (); @@ -1005,3 +1018,26 @@ ContentPanel::window() const { return _splitter; } + + +void +ContentPanel::cucumber_add_content_file (string filename) +{ + list path_list; + path_list.push_back (filename); + add_files (path_list); +} + + +/** This may not be called from the GUI thread */ +std::string +ContentPanel::cucumber_get_content_list () +{ + /* The playlist method that we end up calling has a mutex, so this should be ok */ + std::string s; + BOOST_FOREACH (shared_ptr i, _film->content()) { + bool alert; + s += wx_to_std (text_for_content(i, alert)) + "\n"; + } + return s; +}