Little C++11 cleanup.

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

diff --git a/src/wx/content_view.cc b/src/wx/content_view.cc
index b3a66a7bee500393c43dd535d302dd8c87a13eeb..80256987971e654e6e1bdeb49c193e5cc94de80d 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,29 +18,36 @@
 
 */
 
+
 #include "content_view.h"
 #include "wx_util.h"
-#include "lib/dcpomatic_assert.h"
 #include "lib/config.h"
-#include "lib/dcp_content.h"
 #include "lib/content_factory.h"
+#include "lib/cross.h"
+#include "lib/dcp_content.h"
+#include "lib/dcpomatic_assert.h"
 #include "lib/examine_content_job.h"
 #include "lib/job_manager.h"
-#include "lib/cross.h"
 #include <dcp/exceptions.h>
+#include <dcp/warnings.h>
 #include <boost/filesystem.hpp>
 #include <boost/optional.hpp>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/progdlg.h>
+LIBDCP_ENABLE_WARNINGS
+
 
-using std::string;
 using std::cout;
+using std::dynamic_pointer_cast;
 using std::list;
+using std::make_shared;
 using std::shared_ptr;
+using std::string;
 using std::weak_ptr;
 using boost::optional;
-using std::dynamic_pointer_cast;
 using namespace dcpomatic;
 
+
 ContentView::ContentView (wxWindow* parent)
        : wxListCtrl (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_NO_HEADER)
 {
@@ -51,18 +58,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,29 +79,32 @@ 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 = make_shared<DCPContent>(i);
+                       } else if (i.path().extension() == ".mp4") {
+                               auto all_content = content_factory(i);
+                               if (!all_content.empty()) {
+                                       content = all_content.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);
                        }
@@ -125,6 +137,7 @@ ContentView::update ()
        }
 }
 
+
 void
 ContentView::add (shared_ptr<Content> content)
 {
@@ -152,6 +165,7 @@ ContentView::add (shared_ptr<Content> content)
        SetItem(it);
 }
 
+
 shared_ptr<Content>
 ContentView::get (string digest) const
 {
@@ -161,5 +175,5 @@ ContentView::get (string digest) const
                }
        }
 
-       return shared_ptr<Content>();
+       return {};
 }