X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.cc;h=69dd724266abfc35a780f141833587c2853bd13a;hb=59953282b9f9da1164f39181347a01672c4f674c;hp=1a15d241d774871631c50fc42fd6d57a64d7c031;hpb=676737cbf8aea298e6168ac195589d2f84b5246e;p=dcpomatic.git diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index 1a15d241d..69dd72426 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2019 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,48 +18,53 @@ */ -#include "content_panel.h" -#include "wx_util.h" -#include "video_panel.h" + #include "audio_panel.h" +#include "content_panel.h" +#include "dcpomatic_button.h" +#include "film_viewer.h" +#include "image_sequence_dialog.h" #include "text_panel.h" -#include "timing_panel.h" #include "timeline_dialog.h" -#include "image_sequence_dialog.h" -#include "film_viewer.h" -#include "dcpomatic_button.h" +#include "timing_panel.h" +#include "video_panel.h" +#include "wx_util.h" #include "lib/audio_content.h" -#include "lib/text_content.h" -#include "lib/video_content.h" -#include "lib/ffmpeg_content.h" -#include "lib/content_factory.h" -#include "lib/image_content.h" -#include "lib/dcp_content.h" #include "lib/case_insensitive_sorter.h" -#include "lib/playlist.h" +#include "lib/compose.hpp" #include "lib/config.h" +#include "lib/content_factory.h" +#include "lib/cross.h" +#include "lib/dcp_content.h" +#include "lib/dcp_subtitle_content.h" +#include "lib/dcp_subtitle_decoder.h" +#include "lib/dcpomatic_log.h" +#include "lib/ffmpeg_content.h" +#include "lib/image_content.h" #include "lib/log.h" -#include "lib/compose.hpp" -#include "lib/string_text_file_content.h" +#include "lib/playlist.h" #include "lib/string_text_file.h" -#include "lib/dcpomatic_log.h" -#include -#include -#include +#include "lib/string_text_file_content.h" +#include "lib/text_content.h" +#include "lib/video_content.h" +#include +LIBDCP_DISABLE_WARNINGS #include +#include +#include +#include +LIBDCP_ENABLE_WARNINGS #include -#include -#include + +using std::dynamic_pointer_cast; +using std::exception; using std::list; +using std::make_shared; +using std::shared_ptr; using std::string; -using std::cout; using std::vector; -using std::max; -using std::exception; -using boost::shared_ptr; -using boost::weak_ptr; -using boost::dynamic_pointer_cast; +using std::weak_ptr; using boost::optional; using namespace dcpomatic; #if BOOST_VERSION >= 106100 @@ -68,28 +73,24 @@ using namespace boost::placeholders; ContentPanel::ContentPanel (wxNotebook* n, shared_ptr film, weak_ptr viewer) - : _video_panel (0) - , _audio_panel (0) - , _timeline_dialog (0) - , _parent (n) - , _last_selected_tab (0) + : _parent (n) , _film (film) , _film_viewer (viewer) , _generally_sensitive (true) , _ignore_deselect (false) , _no_check_selection (false) { - for (int i = 0; i < TEXT_COUNT; ++i) { + for (int i = 0; i < static_cast(TextType::COUNT); ++i) { _text_panel[i] = 0; } _splitter = new LimitedSplitter (n); _top_panel = new wxPanel (_splitter); - _menu = new ContentMenu (_splitter); + _menu = new ContentMenu (_splitter, _film_viewer); { - wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + auto s = new wxBoxSizer (wxHORIZONTAL); _content = new wxListCtrl (_top_panel, wxID_ANY, wxDefaultPosition, wxSize (320, 160), wxLC_REPORT | wxLC_NO_HEADER); _content->DragAcceptFiles (true); @@ -98,7 +99,7 @@ ContentPanel::ContentPanel (wxNotebook* n, shared_ptr film, weak_ptrInsertColumn (0, wxT("")); _content->SetColumnWidth (0, 512); - wxBoxSizer* b = new wxBoxSizer (wxVERTICAL); + 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.")); @@ -106,11 +107,11 @@ ContentPanel::ContentPanel (wxNotebook* n, shared_ptr film, weak_ptrSetToolTip (_("Add a folder of image files (which will be used as a moving image sequence) or a folder of sound files.")); - b->Add (_add_folder, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); + b->Add (_add_folder, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); _add_dcp = new Button (_top_panel, _("Add DCP...")); _add_dcp->SetToolTip (_("Add a DCP.")); - b->Add (_add_dcp, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); + 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.")); @@ -136,6 +137,7 @@ ContentPanel::ContentPanel (wxNotebook* n, shared_ptr film, weak_ptrAddPage (_timing_panel, _("Timing"), false); + _timing_panel->create (); _content->Bind (wxEVT_LIST_ITEM_SELECTED, boost::bind (&ContentPanel::item_selected, this)); _content->Bind (wxEVT_LIST_ITEM_DESELECTED, boost::bind (&ContentPanel::item_deselected, this)); @@ -169,7 +171,7 @@ ContentPanel::selected () break; } - ContentList cl = _film->content(); + auto cl = _film->content(); if (s < int (cl.size())) { sel.push_back (cl[s]); } @@ -178,12 +180,13 @@ ContentPanel::selected () return sel; } + ContentList ContentPanel::selected_video () { ContentList vc; - BOOST_FOREACH (shared_ptr i, selected ()) { + for (auto i: selected()) { if (i->video) { vc.push_back (i); } @@ -192,12 +195,13 @@ ContentPanel::selected_video () return vc; } + ContentList ContentPanel::selected_audio () { ContentList ac; - BOOST_FOREACH (shared_ptr i, selected ()) { + for (auto i: selected()) { if (i->audio) { ac.push_back (i); } @@ -206,12 +210,13 @@ ContentPanel::selected_audio () return ac; } + ContentList ContentPanel::selected_text () { ContentList sc; - BOOST_FOREACH (shared_ptr i, selected ()) { + for (auto i: selected()) { if (!i->text.empty()) { sc.push_back (i); } @@ -220,13 +225,14 @@ ContentPanel::selected_text () return sc; } + FFmpegContentList ContentPanel::selected_ffmpeg () { FFmpegContentList sc; - BOOST_FOREACH (shared_ptr i, selected ()) { - shared_ptr t = dynamic_pointer_cast (i); + for (auto i: selected()) { + auto t = dynamic_pointer_cast (i); if (t) { sc.push_back (t); } @@ -235,23 +241,25 @@ ContentPanel::selected_ffmpeg () return sc; } + void ContentPanel::film_changed (Film::Property p) { switch (p) { - case Film::CONTENT: - case Film::CONTENT_ORDER: + case Film::Property::CONTENT: + case Film::Property::CONTENT_ORDER: setup (); break; default: break; } - BOOST_FOREACH (ContentSubPanel* i, panels()) { + for (auto i: panels()) { i->film_changed (p); } } + void ContentPanel::item_deselected () { @@ -262,6 +270,7 @@ ContentPanel::item_deselected () signal_manager->when_idle (boost::bind (&ContentPanel::item_deselected_idle, this)); } + void ContentPanel::item_deselected_idle () { @@ -270,6 +279,7 @@ ContentPanel::item_deselected_idle () } } + void ContentPanel::item_selected () { @@ -277,6 +287,7 @@ ContentPanel::item_selected () check_selection (); } + void ContentPanel::check_selection () { @@ -286,30 +297,37 @@ ContentPanel::check_selection () setup_sensitivity (); - BOOST_FOREACH (ContentSubPanel* i, panels()) { + for (auto i: panels()) { i->content_selection_changed (); } optional go_to; - BOOST_FOREACH (shared_ptr i, selected()) { - DCPTime p; - p = i->position(); - if (dynamic_pointer_cast(i) && i->paths_valid()) { - /* Rather special case; if we select a text subtitle file jump to its - first subtitle. - */ - StringTextFile ts (dynamic_pointer_cast(i)); - if (ts.first()) { - p += DCPTime(ts.first().get(), _film->active_frame_rate_change(i->position())); + for (auto content: selected()) { + if (content->paths_valid()) { + auto position = content->position(); + if (auto text_content = dynamic_pointer_cast(content)) { + /* Rather special case; if we select a text subtitle file jump to its + first subtitle. + */ + StringTextFile ts(text_content); + if (auto first = ts.first()) { + position += DCPTime(first.get(), _film->active_frame_rate_change(content->position())); + } + } else if (auto dcp_content = dynamic_pointer_cast(content)) { + /* Do the same for DCP subtitles */ + DCPSubtitleDecoder ts(_film, dcp_content); + if (auto first = ts.first()) { + position += DCPTime(first.get(), _film->active_frame_rate_change(content->position())); + } + } + if (!go_to || position < go_to.get()) { + go_to = position; } - } - if (!go_to || p < go_to.get()) { - go_to = p; } } if (go_to && Config::instance()->jump_to_selected() && signal_manager) { - shared_ptr fv = _film_viewer.lock (); + auto fv = _film_viewer.lock (); DCPOMATIC_ASSERT (fv); signal_manager->when_idle(boost::bind(&FilmViewer::seek, fv.get(), go_to.get().ceil(_film->video_frame_rate()), true)); } @@ -332,16 +350,16 @@ ContentPanel::check_selection () bool have_video = false; bool have_audio = false; - bool have_text[TEXT_COUNT] = { false, false }; - BOOST_FOREACH (shared_ptr i, selected()) { + bool have_text[static_cast(TextType::COUNT)] = { false, false }; + for (auto i: selected()) { if (i->video) { have_video = true; } if (i->audio) { have_audio = true; } - BOOST_FOREACH (shared_ptr j, i->text) { - have_text[j->original_type()] = true; + for (auto j: i->text) { + have_text[static_cast(j->original_type())] = true; } } @@ -350,6 +368,7 @@ ContentPanel::check_selection () if (have_video && !_video_panel) { _video_panel = new VideoPanel (this); _notebook->InsertPage (off, _video_panel, _video_panel->name()); + _video_panel->create (); } else if (!have_video && _video_panel) { _notebook->DeletePage (off); _video_panel = 0; @@ -362,6 +381,7 @@ ContentPanel::check_selection () if (have_audio && !_audio_panel) { _audio_panel = new AudioPanel (this); _notebook->InsertPage (off, _audio_panel, _audio_panel->name()); + _audio_panel->create (); } else if (!have_audio && _audio_panel) { _notebook->DeletePage (off); _audio_panel = 0; @@ -371,10 +391,11 @@ ContentPanel::check_selection () ++off; } - for (int i = 0; i < TEXT_COUNT; ++i) { + for (int i = 0; i < static_cast(TextType::COUNT); ++i) { if (have_text[i] && !_text_panel[i]) { _text_panel[i] = new TextPanel (this, static_cast(i)); _notebook->InsertPage (off, _text_panel[i], _text_panel[i]->name()); + _text_panel[i]->create (); } else if (!have_text[i] && _text_panel[i]) { _notebook->DeletePage (off); _text_panel[i] = 0; @@ -386,7 +407,7 @@ ContentPanel::check_selection () /* Set up the tab selection */ - bool done = false; + auto done = false; for (size_t i = 0; i < _notebook->GetPageCount(); ++i) { if (_notebook->GetPage(i) == _last_selected_tab) { _notebook->SetSelection (i); @@ -402,6 +423,7 @@ ContentPanel::check_selection () SelectionChanged (); } + void ContentPanel::add_file_clicked () { @@ -412,13 +434,15 @@ ContentPanel::add_file_clicked () return; } + auto path = Config::instance()->add_files_path(); + /* 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 ( + auto d = new wxFileDialog ( _splitter, _("Choose a file or files"), - wxT (""), + std_to_wx(path ? path->string() : home_directory().string()), wxT (""), wxT ("All files|*.*|Subtitle files|*.srt;*.xml|Audio files|*.wav;*.w64;*.flac;*.aif;*.aiff"), wxFD_MULTIPLE | wxFD_CHANGE_DIR @@ -433,19 +457,24 @@ ContentPanel::add_file_clicked () wxArrayString paths; d->GetPaths (paths); - list path_list; + vector path_list; for (unsigned int i = 0; i < paths.GetCount(); ++i) { - path_list.push_back (wx_to_std (paths[i])); + path_list.push_back (wx_to_std(paths[i])); } add_files (path_list); + if (!path_list.empty()) { + Config::instance()->set_add_files_path(path_list[0].parent_path()); + } + d->Destroy (); } + void ContentPanel::add_folder_clicked () { - wxDirDialog* d = new wxDirDialog (_splitter, _("Choose a folder"), wxT(""), wxDD_DIR_MUST_EXIST); + auto d = new wxDirDialog (_splitter, _("Choose a folder"), wxT(""), wxDD_DIR_MUST_EXIST); int r = d->ShowModal (); boost::filesystem::path const path (wx_to_std (d->GetPath ())); d->Destroy (); @@ -468,12 +497,12 @@ ContentPanel::add_folder_clicked () return; } - BOOST_FOREACH (shared_ptr i, content) { - shared_ptr ic = dynamic_pointer_cast (i); + for (auto i: content) { + auto ic = dynamic_pointer_cast (i); if (ic) { - ImageSequenceDialog* e = new ImageSequenceDialog (_splitter); + auto e = new ImageSequenceDialog (_splitter); r = e->ShowModal (); - float const frame_rate = e->frame_rate (); + auto const frame_rate = e->frame_rate (); e->Destroy (); if (r != wxID_OK) { @@ -487,10 +516,11 @@ ContentPanel::add_folder_clicked () } } + void ContentPanel::add_dcp_clicked () { - wxDirDialog* d = new wxDirDialog (_splitter, _("Choose a DCP folder"), wxT(""), wxDD_DIR_MUST_EXIST); + auto d = new wxDirDialog (_splitter, _("Choose a DCP folder"), wxT(""), wxDD_DIR_MUST_EXIST); int r = d->ShowModal (); boost::filesystem::path const path (wx_to_std (d->GetPath ())); d->Destroy (); @@ -500,12 +530,21 @@ ContentPanel::add_dcp_clicked () } try { - _film->examine_and_add_content (shared_ptr (new DCPContent (path))); + _film->examine_and_add_content (make_shared(path)); + } catch (ProjectFolderError &) { + error_dialog ( + _parent, + _( + "This looks like a DCP-o-matic project folder, which cannot be added to a different project. " + "Choose the DCP directory inside the DCP-o-matic project folder if that's what you want to import." + ) + ); } catch (exception& e) { error_dialog (_parent, e.what()); } } + /** @return true if this remove "click" should be ignored */ bool ContentPanel::remove_clicked (bool hotkey) @@ -517,7 +556,7 @@ ContentPanel::remove_clicked (bool hotkey) return true; } - BOOST_FOREACH (shared_ptr i, selected ()) { + for (auto i: selected ()) { _film->remove_content (i); } @@ -525,6 +564,7 @@ ContentPanel::remove_clicked (bool hotkey) return false; } + void ContentPanel::timeline_clicked () { @@ -534,7 +574,7 @@ ContentPanel::timeline_clicked () if (_timeline_dialog) { _timeline_dialog->Destroy (); - _timeline_dialog = 0; + _timeline_dialog = nullptr; } _timeline_dialog = new TimelineDialog (this, _film, _film_viewer); @@ -542,12 +582,14 @@ ContentPanel::timeline_clicked () _timeline_dialog->Show (); } + void ContentPanel::right_click (wxListEvent& ev) { _menu->popup (_film, selected (), TimelineContentViewList (), ev.GetPoint ()); } + /** Set up broad sensitivity based on the type of content that is selected */ void ContentPanel::setup_sensitivity () @@ -556,9 +598,9 @@ ContentPanel::setup_sensitivity () _add_folder->Enable (_generally_sensitive); _add_dcp->Enable (_generally_sensitive); - ContentList selection = selected (); - ContentList video_selection = selected_video (); - ContentList audio_selection = selected_audio (); + auto selection = selected (); + auto video_selection = selected_video (); + auto audio_selection = selected_audio (); _remove->Enable (_generally_sensitive && !selection.empty()); _earlier->Enable (_generally_sensitive && selection.size() == 1); @@ -571,7 +613,7 @@ ContentPanel::setup_sensitivity () if (_audio_panel) { _audio_panel->Enable (_generally_sensitive && audio_selection.size() > 0); } - for (int i = 0; i < TEXT_COUNT; ++i) { + for (int i = 0; i < static_cast(TextType::COUNT); ++i) { if (_text_panel[i]) { _text_panel[i]->Enable (_generally_sensitive && selection.size() == 1 && !selection.front()->text.empty()); } @@ -579,6 +621,7 @@ ContentPanel::setup_sensitivity () _timing_panel->Enable (_generally_sensitive); } + void ContentPanel::set_film (shared_ptr film) { @@ -588,8 +631,8 @@ ContentPanel::set_film (shared_ptr film) _film = film; - film_changed (Film::CONTENT); - film_changed (Film::AUDIO_CHANNELS); + film_changed (Film::Property::CONTENT); + film_changed (Film::Property::AUDIO_CHANNELS); if (_film) { check_selection (); @@ -598,6 +641,7 @@ ContentPanel::set_film (shared_ptr film) setup_sensitivity (); } + void ContentPanel::set_general_sensitivity (bool s) { @@ -605,30 +649,33 @@ ContentPanel::set_general_sensitivity (bool s) setup_sensitivity (); } + void ContentPanel::earlier_clicked () { - ContentList sel = selected (); + auto sel = selected (); if (sel.size() == 1) { _film->move_content_earlier (sel.front ()); check_selection (); } } + void ContentPanel::later_clicked () { - ContentList sel = selected (); + auto sel = selected (); if (sel.size() == 1) { _film->move_content_later (sel.front ()); check_selection (); } } + void ContentPanel::set_selection (weak_ptr wc) { - ContentList content = _film->content (); + auto content = _film->content (); for (size_t i = 0; i < content.size(); ++i) { if (content[i] == wc.lock ()) { _content->SetItemState (i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); @@ -638,12 +685,13 @@ ContentPanel::set_selection (weak_ptr wc) } } + void ContentPanel::set_selection (ContentList cl) { _no_check_selection = true; - ContentList content = _film->content (); + auto content = _film->content (); for (size_t i = 0; i < content.size(); ++i) { if (find(cl.begin(), cl.end(), content[i]) != cl.end()) { _content->SetItemState (i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); @@ -656,6 +704,14 @@ ContentPanel::set_selection (ContentList cl) check_selection (); } + +void +ContentPanel::select_all () +{ + set_selection (_film->content()); +} + + void ContentPanel::film_content_changed (int property) { @@ -669,11 +725,12 @@ ContentPanel::film_content_changed (int property) setup (); } - BOOST_FOREACH (ContentSubPanel* i, panels()) { + for (auto i: panels()) { i->film_content_changed (property); } } + void ContentPanel::setup () { @@ -683,10 +740,10 @@ ContentPanel::setup () return; } - ContentList content = _film->content (); + auto content = _film->content (); - Content* selected_content = 0; - int const s = _content->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); + Content* selected_content = nullptr; + auto const s = _content->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); if (s != -1) { wxListItem item; item.SetId (s); @@ -697,15 +754,15 @@ ContentPanel::setup () _content->DeleteAllItems (); - BOOST_FOREACH (shared_ptr i, content) { + for (auto i: content) { int const t = _content->GetItemCount (); bool const valid = i->paths_valid (); - shared_ptr dcp = dynamic_pointer_cast (i); + auto dcp = dynamic_pointer_cast (i); bool const needs_kdm = dcp && dcp->needs_kdm (); bool const needs_assets = dcp && dcp->needs_assets (); - wxString s = std_to_wx (i->summary ()); + auto s = std_to_wx (i->summary ()); if (!valid) { s = _("MISSING: ") + s; @@ -742,6 +799,7 @@ ContentPanel::setup () setup_sensitivity (); } + void ContentPanel::files_dropped (wxDropFilesEvent& event) { @@ -749,30 +807,31 @@ ContentPanel::files_dropped (wxDropFilesEvent& event) return; } - wxString* paths = event.GetFiles (); - list path_list; + auto paths = event.GetFiles (); + vector path_list; for (int i = 0; i < event.GetNumberOfFiles(); i++) { - path_list.push_back (wx_to_std (paths[i])); + path_list.push_back (wx_to_std(paths[i])); } add_files (path_list); } + void -ContentPanel::add_files (list paths) +ContentPanel::add_files (vector paths) { /* It has been reported that the paths returned from e.g. wxFileDialog are not always sorted; I can't reproduce that, but sort them anyway. Don't use ImageFilenameSorter as a normal alphabetical sort is expected here. */ - paths.sort (CaseInsensitiveSorter ()); + std::sort (paths.begin(), paths.end(), CaseInsensitiveSorter()); /* XXX: check for lots of files here and do something */ try { - BOOST_FOREACH (boost::filesystem::path i, paths) { - BOOST_FOREACH (shared_ptr j, content_factory(i)) { + for (auto i: paths) { + for (auto j: content_factory(i)) { _film->examine_and_add_content (j); } } @@ -781,6 +840,7 @@ ContentPanel::add_files (list paths) } } + list ContentPanel::panels () const { @@ -791,7 +851,7 @@ ContentPanel::panels () const if (_audio_panel) { p.push_back (_audio_panel); } - for (int i = 0; i < TEXT_COUNT; ++i) { + for (int i = 0; i < static_cast(TextType::COUNT); ++i) { if (_text_panel[i]) { p.push_back (_text_panel[i]); }