BOOST_FOREACH.

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

diff --git a/src/wx/content_view.cc b/src/wx/content_view.cc
index aeefb65df7cdc20e963f49f53fb476043c1cd70d..44e575d9393bcc06a349d88901c1cb5b20021a10 100644 (file)
--- a/src/wx/content_view.cc
+++ b/src/wx/content_view.cc
@@ -33,14 +33,16 @@
 #include <wx/progdlg.h>
 
 using std::string;
-using boost::shared_ptr;
-using boost::weak_ptr;
+using std::cout;
+using std::list;
+using std::shared_ptr;
+using std::weak_ptr;
 using boost::optional;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
+using namespace dcpomatic;
 
-ContentView::ContentView (wxWindow* parent, weak_ptr<Film> film)
+ContentView::ContentView (wxWindow* parent)
        : wxListCtrl (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_NO_HEADER)
-       , _film (film)
 {
        AppendColumn (wxT(""), wxLIST_FORMAT_LEFT, 80);
        /* type */
@@ -64,59 +66,63 @@ ContentView::selected () const
 void
 ContentView::update ()
 {
-       if (!IsShown()) {
-               return;
-       }
-
-       shared_ptr<Film> film = _film.lock ();
-       if (!film) {
-               return;
-       }
-
        using namespace boost::filesystem;
 
        DeleteAllItems ();
        _content.clear ();
        optional<path> dir = Config::instance()->player_content_directory();
-       if (!dir) {
-               return;
+       if (!dir || !boost::filesystem::is_directory(*dir)) {
+               dir = home_directory ();
        }
 
        wxProgressDialog progress (_("DCP-o-matic"), _("Reading content directory"));
        JobManager* jm = JobManager::instance ();
 
+       list<shared_ptr<ExamineContentJob> > jobs;
+
        for (directory_iterator i = directory_iterator(*dir); i != directory_iterator(); ++i) {
                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(film, *i));
+                               content.reset (new DCPContent(*i));
                        } else if (i->path().extension() == ".mp4" || i->path().extension() == ".ecinema") {
-                               content = content_factory(film, *i).front();
+                               content = content_factory(*i).front();
                        }
 
                        if (content) {
-                               jm->add (shared_ptr<Job>(new ExamineContentJob(film, content)));
-                               while (jm->work_to_do()) {
-                                       if (!progress.Pulse()) {
-                                               /* user pressed cancel */
-                                               BOOST_FOREACH (shared_ptr<Job> i, jm->get()) {
-                                                       i->cancel();
-                                               }
-                                               return;
-                                       }
-                                       dcpomatic_sleep (1);
-                               }
-                               if (report_errors_from_last_job (this)) {
-                                       add (content);
-                                       _content.push_back (content);
-                               }
+                               shared_ptr<ExamineContentJob> job(new 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 */
                }
        }
+
+       while (jm->work_to_do()) {
+               if (!progress.Pulse()) {
+                       /* user pressed cancel */
+                       for (auto i: jm->get()) {
+                               i->cancel();
+                       }
+                       return;
+               }
+               dcpomatic_sleep_seconds (1);
+       }
+
+       /* Add content from successful jobs and report errors */
+       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 {
+                       add (i->content());
+                       _content.push_back (i->content());
+               }
+       }
 }
 
 void
@@ -127,7 +133,7 @@ ContentView::add (shared_ptr<Content> content)
        wxListItem it;
        it.SetId(N);
        it.SetColumn(0);
-       DCPTime length = content->length_after_trim ();
+       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));
@@ -150,7 +156,7 @@ ContentView::add (shared_ptr<Content> content)
 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;
                }