X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Fcontent_menu.cc;h=93bcc0a6d4042f05a4980e96f1212ea49ebfc27f;hb=09df98b2b47f6f9a754d5ff8a1787da5a07c14b4;hp=1ac13b143356b5fea68f7e8d101eb9f236df3c20;hpb=cb6729aa79b555b219974207fbe2ff0510f9d3ea;p=dcpomatic.git diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index 1ac13b143..93bcc0a6d 100644 --- a/src/wx/content_menu.cc +++ b/src/wx/content_menu.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2020 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,44 +18,54 @@ */ + +#include "auto_crop_dialog.h" +#include "content_advanced_dialog.h" #include "content_menu.h" +#include "content_properties_dialog.h" +#include "film_viewer.h" #include "repeat_dialog.h" -#include "wx_util.h" -#include "timeline_video_content_view.h" #include "timeline_audio_content_view.h" -#include "content_properties_dialog.h" -#include "content_advanced_dialog.h" -#include "lib/playlist.h" -#include "lib/film.h" -#include "lib/image_content.h" +#include "timeline_video_content_view.h" +#include "wx_util.h" +#include "lib/audio_content.h" +#include "lib/config.h" #include "lib/content_factory.h" -#include "lib/examine_content_job.h" -#include "lib/job_manager.h" -#include "lib/exceptions.h" +#include "lib/copy_dcp_details_to_film.h" #include "lib/dcp_content.h" #include "lib/dcp_examiner.h" +#include "lib/examine_content_job.h" +#include "lib/exceptions.h" #include "lib/ffmpeg_content.h" -#include "lib/audio_content.h" -#include "lib/config.h" -#include "lib/copy_dcp_details_to_film.h" +#include "lib/film.h" +#include "lib/guess_crop.h" +#include "lib/image_content.h" +#include "lib/job_manager.h" +#include "lib/playlist.h" +#include "lib/video_content.h" #include -#include #include -#include +#include +#include +#include +LIBDCP_DISABLE_WARNINGS #include -#include +#include +LIBDCP_ENABLE_WARNINGS -using std::cout; -using std::vector; + +using std::dynamic_pointer_cast; using std::exception; using std::list; +using std::make_shared; using std::shared_ptr; +using std::vector; using std::weak_ptr; -using std::dynamic_pointer_cast; using boost::optional; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif +using namespace dcpomatic; enum { @@ -66,6 +76,7 @@ enum { ID_properties, ID_advanced, ID_re_examine, + ID_auto_crop, ID_kdm, ID_ov, ID_choose_cpl, @@ -73,17 +84,20 @@ enum { ID_remove }; -ContentMenu::ContentMenu (wxWindow* p) + +ContentMenu::ContentMenu (wxWindow* p, weak_ptr viewer) : _menu (new wxMenu) , _parent (p) , _pop_up_open (false) + , _viewer (viewer) { _repeat = _menu->Append (ID_repeat, _("Repeat...")); _join = _menu->Append (ID_join, _("Join")); _find_missing = _menu->Append (ID_find_missing, _("Find missing...")); + _re_examine = _menu->Append (ID_re_examine, _("Re-examine...")); + _auto_crop = _menu->Append (ID_auto_crop, _("Auto-crop...")); _properties = _menu->Append (ID_properties, _("Properties...")); _advanced = _menu->Append (ID_advanced, _("Advanced settings...")); - _re_examine = _menu->Append (ID_re_examine, _("Re-examine...")); _menu->AppendSeparator (); _kdm = _menu->Append (ID_kdm, _("Add KDM...")); _ov = _menu->Append (ID_ov, _("Add OV...")); @@ -99,6 +113,7 @@ ContentMenu::ContentMenu (wxWindow* p) _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::properties, this), ID_properties); _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::advanced, this), ID_advanced); _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::re_examine, this), ID_re_examine); + _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::auto_crop, this), ID_auto_crop); _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::kdm, this), ID_kdm); _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::ov, this), ID_ov); _parent->Bind (wxEVT_MENU, boost::bind (&ContentMenu::set_dcp_settings, this), ID_set_dcp_settings); @@ -133,21 +148,21 @@ ContentMenu::popup (weak_ptr film, ContentList c, TimelineContentViewList _properties->Enable (_content.size() == 1); _advanced->Enable (_content.size() == 1); _re_examine->Enable (!_content.empty ()); + _auto_crop->Enable (_content.size() == 1); if (_content.size() == 1) { - shared_ptr dcp = dynamic_pointer_cast (_content.front ()); + auto dcp = dynamic_pointer_cast (_content.front()); if (dcp) { _kdm->Enable (dcp->encrypted ()); _ov->Enable (dcp->needs_assets ()); _set_dcp_settings->Enable (static_cast(dcp)); try { - DCPExaminer ex (dcp, true); - auto cpls = ex.cpls (); + auto cpls = dcp::find_and_resolve_cpls (dcp->directories(), true); _choose_cpl->Enable (cpls.size() > 1); /* We can't have 0 as a menu item ID on OS X */ int id = 1; for (auto i: cpls) { - wxMenuItem* item = _cpl_menu->AppendRadioItem ( + auto item = _cpl_menu->AppendRadioItem ( id++, wxString::Format ( "%s (%s)", @@ -186,13 +201,13 @@ ContentMenu::popup (weak_ptr film, ContentList c, TimelineContentViewList void ContentMenu::set_dcp_settings () { - shared_ptr film = _film.lock (); + auto film = _film.lock (); if (!film) { return; } DCPOMATIC_ASSERT (_content.size() == 1); - shared_ptr dcp = dynamic_pointer_cast(_content.front()); + auto dcp = dynamic_pointer_cast(_content.front()); DCPOMATIC_ASSERT (dcp); copy_dcp_details_to_film (dcp, film); } @@ -205,13 +220,13 @@ ContentMenu::repeat () return; } - RepeatDialog* d = new RepeatDialog (_parent); + auto d = new RepeatDialog (_parent); if (d->ShowModal() != wxID_OK) { d->Destroy (); return; } - shared_ptr film = _film.lock (); + auto film = _film.lock (); if (!film) { return; } @@ -223,12 +238,13 @@ ContentMenu::repeat () _views.clear (); } + void ContentMenu::join () { - vector > fc; + vector> fc; for (auto i: _content) { - shared_ptr f = dynamic_pointer_cast (i); + auto f = dynamic_pointer_cast (i); if (f) { fc.push_back (f); } @@ -236,13 +252,13 @@ ContentMenu::join () DCPOMATIC_ASSERT (fc.size() > 1); - shared_ptr film = _film.lock (); + auto film = _film.lock (); if (!film) { return; } try { - shared_ptr joined (new FFmpegContent(fc)); + auto joined = make_shared(fc); film->remove_content (_content); film->examine_and_add_content (joined); } catch (JoinError& e) { @@ -250,6 +266,7 @@ ContentMenu::join () } } + void ContentMenu::remove () { @@ -257,7 +274,7 @@ ContentMenu::remove () return; } - shared_ptr film = _film.lock (); + auto film = _film.lock (); if (!film) { return; } @@ -269,7 +286,7 @@ ContentMenu::remove () if not, and its audio view is selected, we unmap the audio. */ for (auto i: _content) { - shared_ptr fc = dynamic_pointer_cast (i); + auto fc = dynamic_pointer_cast (i); if (!fc) { continue; } @@ -278,8 +295,8 @@ ContentMenu::remove () shared_ptr audio; for (auto j: _views) { - shared_ptr v = dynamic_pointer_cast (j); - shared_ptr a = dynamic_pointer_cast (j); + auto v = dynamic_pointer_cast(j); + auto a = dynamic_pointer_cast(j); if (v && v->content() == fc) { video = v; } else if (a && a->content() == fc) { @@ -288,7 +305,7 @@ ContentMenu::remove () } if (!video && audio) { - AudioMapping m = fc->audio->mapping (); + auto m = fc->audio->mapping (); m.unmap_all (); fc->audio->set_mapping (m); handled = true; @@ -304,6 +321,7 @@ ContentMenu::remove () _views.clear (); } + void ContentMenu::find_missing () { @@ -311,35 +329,35 @@ ContentMenu::find_missing () return; } - shared_ptr film = _film.lock (); + auto film = _film.lock (); if (!film) { return; } /* XXX: a bit nasty */ - shared_ptr ic = dynamic_pointer_cast (_content.front ()); - shared_ptr dc = dynamic_pointer_cast (_content.front ()); + auto ic = dynamic_pointer_cast (_content.front()); + auto dc = dynamic_pointer_cast (_content.front()); int r = wxID_CANCEL; boost::filesystem::path path; if ((ic && !ic->still ()) || dc) { - wxDirDialog* d = new wxDirDialog (0, _("Choose a folder"), wxT (""), wxDD_DIR_MUST_EXIST); + auto d = new wxDirDialog (0, _("Choose a folder"), wxT (""), wxDD_DIR_MUST_EXIST); r = d->ShowModal (); path = wx_to_std (d->GetPath ()); d->Destroy (); } else { - wxFileDialog* d = new wxFileDialog (0, _("Choose a file"), wxT (""), wxT (""), wxT ("*.*"), wxFD_MULTIPLE); + auto d = new wxFileDialog (0, _("Choose a file"), wxT (""), wxT (""), wxT ("*.*")); r = d->ShowModal (); path = wx_to_std (d->GetPath ()); d->Destroy (); } - list > content; + list> content; if (r == wxID_OK) { if (dc) { - content.push_back (shared_ptr(new DCPContent(path))); + content.push_back (make_shared(path)); } else { content = content_factory (path); } @@ -350,7 +368,7 @@ ContentMenu::find_missing () } for (auto i: content) { - shared_ptr j (new ExamineContentJob (film, i)); + auto j = make_shared(film, i); j->Finished.connect ( bind ( @@ -369,7 +387,7 @@ ContentMenu::find_missing () void ContentMenu::re_examine () { - shared_ptr film = _film.lock (); + auto film = _film.lock (); if (!film) { return; } @@ -382,13 +400,13 @@ ContentMenu::re_examine () void ContentMenu::maybe_found_missing (weak_ptr j, weak_ptr oc, weak_ptr nc) { - shared_ptr job = j.lock (); + auto job = j.lock (); if (!job || !job->finished_ok ()) { return; } - shared_ptr old_content = oc.lock (); - shared_ptr new_content = nc.lock (); + auto old_content = oc.lock (); + auto new_content = nc.lock (); DCPOMATIC_ASSERT (old_content); DCPOMATIC_ASSERT (new_content); @@ -404,10 +422,10 @@ void ContentMenu::kdm () { DCPOMATIC_ASSERT (!_content.empty ()); - shared_ptr dcp = dynamic_pointer_cast (_content.front ()); + auto dcp = dynamic_pointer_cast (_content.front()); DCPOMATIC_ASSERT (dcp); - wxFileDialog* d = new wxFileDialog (_parent, _("Select KDM")); + auto d = new wxFileDialog (_parent, _("Select KDM")); if (d->ShowModal() == wxID_OK) { optional kdm; @@ -430,16 +448,9 @@ ContentMenu::kdm () return; } - DCPExaminer ex (dcp, true); - - bool kdm_matches_any_cpl = false; - for (auto i: ex.cpls()) { - if (i->id() == kdm->cpl_id()) { - kdm_matches_any_cpl = true; - } - } - - bool kdm_matches_selected_cpl = dcp->cpl() || kdm->cpl_id() == dcp->cpl().get(); + auto cpls = dcp::find_and_resolve_cpls (dcp->directories(), true); + bool const kdm_matches_any_cpl = std::any_of(cpls.begin(), cpls.end(), [kdm](shared_ptr cpl) { return cpl->id() == kdm->cpl_id(); }); + bool const kdm_matches_selected_cpl = dcp->cpl() || kdm->cpl_id() == dcp->cpl().get(); if (!kdm_matches_any_cpl) { error_dialog (_parent, _("This KDM was not made for this DCP. You will need a different one.")); @@ -452,9 +463,9 @@ ContentMenu::kdm () dcp->add_kdm (*kdm); - shared_ptr film = _film.lock (); + auto film = _film.lock (); DCPOMATIC_ASSERT (film); - JobManager::instance()->add (shared_ptr (new ExamineContentJob (film, dcp))); + JobManager::instance()->add (make_shared(film, dcp)); } d->Destroy (); @@ -464,16 +475,16 @@ void ContentMenu::ov () { DCPOMATIC_ASSERT (!_content.empty ()); - shared_ptr dcp = dynamic_pointer_cast (_content.front ()); + auto dcp = dynamic_pointer_cast (_content.front()); DCPOMATIC_ASSERT (dcp); - wxDirDialog* d = new wxDirDialog (_parent, _("Select OV")); + auto d = new wxDirDialog (_parent, _("Select OV")); if (d->ShowModal() == wxID_OK) { - dcp->add_ov (wx_to_std (d->GetPath ())); + dcp->add_ov (wx_to_std (d->GetPath())); shared_ptr film = _film.lock (); DCPOMATIC_ASSERT (film); - JobManager::instance()->add (shared_ptr (new ExamineContentJob (film, dcp))); + JobManager::instance()->add (make_shared(film, dcp)); } d->Destroy (); @@ -482,9 +493,9 @@ ContentMenu::ov () void ContentMenu::properties () { - shared_ptr film = _film.lock (); + auto film = _film.lock (); DCPOMATIC_ASSERT (film); - ContentPropertiesDialog* d = new ContentPropertiesDialog (_parent, film, _content.front()); + auto d = new ContentPropertiesDialog (_parent, film, _content.front()); d->ShowModal (); d->Destroy (); } @@ -493,7 +504,7 @@ ContentMenu::properties () void ContentMenu::advanced () { - ContentAdvancedDialog* d = new ContentAdvancedDialog (_parent, _content.front()); + auto d = new ContentAdvancedDialog (_parent, _content.front()); d->ShowModal (); d->Destroy (); } @@ -507,21 +518,101 @@ ContentMenu::cpl_selected (wxCommandEvent& ev) } DCPOMATIC_ASSERT (!_content.empty ()); - shared_ptr dcp = dynamic_pointer_cast (_content.front ()); + auto dcp = dynamic_pointer_cast (_content.front()); DCPOMATIC_ASSERT (dcp); - DCPExaminer ex (dcp, true); - list > cpls = ex.cpls (); + auto cpls = dcp::find_and_resolve_cpls (dcp->directories(), true); DCPOMATIC_ASSERT (ev.GetId() > 0); DCPOMATIC_ASSERT (ev.GetId() <= int (cpls.size())); - list >::const_iterator i = cpls.begin (); + auto i = cpls.begin (); for (int j = 0; j < ev.GetId() - 1; ++j) { ++i; } dcp->set_cpl ((*i)->id ()); - shared_ptr film = _film.lock (); + auto film = _film.lock (); DCPOMATIC_ASSERT (film); - JobManager::instance()->add (shared_ptr (new ExamineContentJob (film, dcp))); + JobManager::instance()->add (make_shared(film, dcp)); +} + + +void +ContentMenu::auto_crop () +{ + DCPOMATIC_ASSERT (_content.size() == 1); + + auto film = _film.lock (); + DCPOMATIC_ASSERT (film); + auto viewer = _viewer.lock (); + DCPOMATIC_ASSERT (viewer); + + auto update_viewer = [this](Crop crop) { + auto film = _film.lock(); + DCPOMATIC_ASSERT (film); + auto viewer = _viewer.lock (); + DCPOMATIC_ASSERT (viewer); + auto const content = _content.front(); + auto const current_crop = content->video->actual_crop(); + viewer->set_crop_guess ( + dcpomatic::Rect( + static_cast(std::max(0, crop.left - current_crop.left)) / content->video->size().width, + static_cast(std::max(0, crop.top - current_crop.top)) / content->video->size().height, + 1.0f - (static_cast(std::max(0, crop.left - current_crop.left + crop.right - current_crop.right)) / content->video->size().width), + 1.0f - (static_cast(std::max(0, crop.top - current_crop.top + crop.bottom - current_crop.bottom)) / content->video->size().height) + )); + }; + + auto guess_crop_for_content = [this, film, viewer]() { + auto position = viewer->position_in_content(_content.front()).get_value_or( + ContentTime::from_frames(_content.front()->video->length(), _content.front()->video_frame_rate().get_value_or(24)) + ); + return guess_crop(film, _content.front(), Config::instance()->auto_crop_threshold(), position); + }; + + /* Make an initial guess in the view and open the dialog */ + + auto const crop = guess_crop_for_content (); + update_viewer (crop); + + if (_auto_crop_dialog) { + _auto_crop_dialog->Destroy(); + _auto_crop_dialog = nullptr; + } + _auto_crop_dialog = new AutoCropDialog (_parent, crop); + _auto_crop_dialog->Show (); + + /* Update the dialog and view when the crop threshold changes */ + _auto_crop_config_connection = Config::instance()->Changed.connect([this, guess_crop_for_content, update_viewer](Config::Property property) { + auto film = _film.lock(); + DCPOMATIC_ASSERT (film); + if (property == Config::AUTO_CROP_THRESHOLD) { + auto const crop = guess_crop_for_content(); + _auto_crop_dialog->set(crop); + update_viewer(crop); + } + }); + + /* Also update the dialog and view when we're looking at a different frame */ + _auto_crop_viewer_connection = viewer->ImageChanged.connect([this, guess_crop_for_content, update_viewer](shared_ptr) { + auto const crop = guess_crop_for_content(); + _auto_crop_dialog->set(crop); + update_viewer(crop); + }); + + /* Handle the user closing the dialog (with OK or cancel) */ + _auto_crop_dialog->Bind (wxEVT_BUTTON, [this, viewer](wxCommandEvent& ev) { + _auto_crop_config_connection.disconnect (); + _auto_crop_viewer_connection.disconnect (); + if (ev.GetId() == wxID_OK) { + _content.front()->video->set_crop(_auto_crop_dialog->get()); + } + _auto_crop_dialog->Show (false); + viewer->unset_crop_guess (); + }); + + /* Update the view when something in the dialog is changed */ + _auto_crop_dialog->Changed.connect([update_viewer](Crop crop) { + update_viewer (crop); + }); }