Assorted C++11/formatting cleanups.

[dcpomatic.git] / src / wx / content_view.cc

diff --git a/src/wx/content_view.cc b/src/wx/content_view.cc
index 1cdfbc00f8f4fb49d95a9594330404195d34695d..8055e2f2d2fb2f043c147984bf30ecd99dd542ec 100644 (file)
--- a/src/wx/content_view.cc
+++ b/src/wx/content_view.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2018-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,6 +18,7 @@
 
 */
 
+
 #include "content_view.h"
 #include "wx_util.h"
 #include "lib/dcpomatic_assert.h"
@@ -32,15 +33,18 @@
 #include <boost/optional.hpp>
 #include <wx/progdlg.h>
 
-using std::string;
+
 using std::cout;
+using std::dynamic_pointer_cast;
 using std::list;
-using boost::shared_ptr;
-using boost::weak_ptr;
+using std::make_shared;
+using std::shared_ptr;
+using std::string;
+using std::weak_ptr;
 using boost::optional;
-using boost::dynamic_pointer_cast;
 using namespace dcpomatic;
 
+
 ContentView::ContentView (wxWindow* parent)
        : wxListCtrl (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_NO_HEADER)
 {
@@ -51,18 +55,20 @@ ContentView::ContentView (wxWindow* parent)
        AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 580);
 }
 
+
 shared_ptr<Content>
 ContentView::selected () const
 {
        long int s = GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
        if (s == -1) {
-               return shared_ptr<Content>();
+               return {};
        }
 
        DCPOMATIC_ASSERT (s < int(_content.size()));
        return _content[s];
 }
 
+
 void
 ContentView::update ()
 {
@@ -70,33 +76,35 @@ ContentView::update ()
 
        DeleteAllItems ();
        _content.clear ();
-       optional<path> dir = Config::instance()->player_content_directory();
+       auto dir = Config::instance()->player_content_directory();
        if (!dir || !boost::filesystem::is_directory(*dir)) {
                dir = home_directory ();
        }
 
        wxProgressDialog progress (_("DCP-o-matic"), _("Reading content directory"));
-       JobManager* jm = JobManager::instance ();
+       auto jm = JobManager::instance ();
 
-       list<shared_ptr<ExamineContentJob> > jobs;
+       list<shared_ptr<ExamineContentJob>> jobs;
 
-       for (directory_iterator i = directory_iterator(*dir); i != directory_iterator(); ++i) {
+       for (auto i: directory_iterator(*dir)) {
                try {
+                       progress.Pulse ();
+
                        shared_ptr<Content> content;
-                       if (is_directory(*i) && (is_regular_file(*i / "ASSETMAP") || is_regular_file(*i / "ASSETMAP.xml"))) {
-                               content.reset (new DCPContent(*i));
-                       } else if (i->path().extension() == ".mp4" || i->path().extension() == ".ecinema") {
-                               content = content_factory(*i).front();
+                       if (is_directory(i) && (is_regular_file(i / "ASSETMAP") || is_regular_file(i / "ASSETMAP.xml"))) {
+                               content.reset (new DCPContent(i));
+                       } else if (i.path().extension() == ".mp4" || i.path().extension() == ".ecinema") {
+                               content = content_factory(i).front();
                        }
 
                        if (content) {
-                               shared_ptr<ExamineContentJob> job(new ExamineContentJob(shared_ptr<Film>(), content));
+                               auto job = make_shared<ExamineContentJob>(shared_ptr<Film>(), content);
                                jm->add (job);
                                jobs.push_back (job);
                        }
                } catch (boost::filesystem::filesystem_error& e) {
                        /* Never mind */
-               } catch (dcp::DCPReadError& e) {
+               } catch (dcp::ReadError& e) {
                        /* Never mind */
                }
        }
@@ -104,7 +112,7 @@ ContentView::update ()
        while (jm->work_to_do()) {
                if (!progress.Pulse()) {
                        /* user pressed cancel */
-                       BOOST_FOREACH (shared_ptr<Job> i, jm->get()) {
+                       for (auto i: jm->get()) {
                                i->cancel();
                        }
                        return;
@@ -113,7 +121,7 @@ ContentView::update ()
        }
 
        /* Add content from successful jobs and report errors */
-       BOOST_FOREACH (shared_ptr<ExamineContentJob> i, jobs) {
+       for (auto i: jobs) {
                if (i->finished_in_error()) {
                        error_dialog(this, std_to_wx(i->error_summary()) + ".\n", std_to_wx(i->error_details()));
                } else {
@@ -123,6 +131,7 @@ ContentView::update ()
        }
 }
 
+
 void
 ContentView::add (shared_ptr<Content> content)
 {
@@ -131,13 +140,12 @@ ContentView::add (shared_ptr<Content> content)
        wxListItem it;
        it.SetId(N);
        it.SetColumn(0);
-       DCPTime length = content->approximate_length ();
-       int h, m, s, f;
-       length.split (24, h, m, s, f);
-       it.SetText(wxString::Format("%02d:%02d:%02d", h, m, s));
+       auto length = content->approximate_length ();
+       auto const hmsf = length.split (24);
+       it.SetText(wxString::Format("%02d:%02d:%02d", hmsf.h, hmsf.m, hmsf.s));
        InsertItem(it);
 
-       shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent>(content);
+       auto dcp = dynamic_pointer_cast<DCPContent>(content);
        if (dcp && dcp->content_kind()) {
                it.SetId(N);
                it.SetColumn(1);
@@ -151,14 +159,15 @@ ContentView::add (shared_ptr<Content> content)
        SetItem(it);
 }
 
+
 shared_ptr<Content>
 ContentView::get (string digest) const
 {
-       BOOST_FOREACH (shared_ptr<Content> i, _content) {
+       for (auto i: _content) {
                if (i->digest() == digest) {
                        return i;
                }
        }
 
-       return shared_ptr<Content>();
+       return {};
 }