From 4908d834fc73201da2735cdc5dfb1f5589aa8586 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 7 Feb 2021 21:32:44 +0100 Subject: [PATCH] C++ tidying. --- src/wx/content_menu.cc | 95 +++++++++++++++++++++++------------------- 1 file changed, 51 insertions(+), 44 deletions(-) diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index 1ac13b143..e7ce3cc9c 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,6 +18,7 @@ */ + #include "content_menu.h" #include "repeat_dialog.h" #include "wx_util.h" @@ -45,6 +46,7 @@ #include #include + using std::cout; using std::vector; using std::exception; @@ -52,6 +54,7 @@ using std::list; using std::shared_ptr; using std::weak_ptr; using std::dynamic_pointer_cast; +using std::make_shared; using boost::optional; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; @@ -73,6 +76,7 @@ enum { ID_remove }; + ContentMenu::ContentMenu (wxWindow* p) : _menu (new wxMenu) , _parent (p) @@ -135,7 +139,7 @@ ContentMenu::popup (weak_ptr film, ContentList c, TimelineContentViewList _re_examine->Enable (!_content.empty ()); 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 ()); @@ -147,7 +151,7 @@ ContentMenu::popup (weak_ptr film, ContentList c, TimelineContentViewList /* 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 +190,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 +209,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 +227,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 +241,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 +255,7 @@ ContentMenu::join () } } + void ContentMenu::remove () { @@ -257,7 +263,7 @@ ContentMenu::remove () return; } - shared_ptr film = _film.lock (); + auto film = _film.lock (); if (!film) { return; } @@ -269,7 +275,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 +284,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 +294,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 +310,7 @@ ContentMenu::remove () _views.clear (); } + void ContentMenu::find_missing () { @@ -311,35 +318,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 ("*.*"), wxFD_MULTIPLE); 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 +357,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 +376,7 @@ ContentMenu::find_missing () void ContentMenu::re_examine () { - shared_ptr film = _film.lock (); + auto film = _film.lock (); if (!film) { return; } @@ -382,13 +389,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 +411,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; @@ -452,9 +459,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 +471,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 +489,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 +500,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 +514,21 @@ 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 = ex.cpls (); 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)); } -- 2.30.2