BOOST_FOREACH.

[dcpomatic.git] / src / tools / dcpomatic_batch.cc

diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc
index 48c7c2da5c88f1ce9534659f617502f3bd3c0b68..9cb6ddc5546fc3887a598641e9bfc5c0d3ddd996 100644 (file)
--- a/src/tools/dcpomatic_batch.cc
+++ b/src/tools/dcpomatic_batch.cc
@@ -40,7 +40,6 @@
 #include <wx/splash.h>
 #include <wx/preferences.h>
 #include <wx/wx.h>
-#include <boost/foreach.hpp>
 #include <iostream>
 #include <set>
 
@@ -49,10 +48,13 @@ using std::string;
 using std::cout;
 using std::list;
 using std::set;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::thread;
 using boost::scoped_array;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 static list<boost::filesystem::path> films_to_load;
 
@@ -176,13 +178,13 @@ public:
 
                        set<shared_ptr<const Film> > films;
 
-                       BOOST_FOREACH (shared_ptr<Job> i, JobManager::instance()->get()) {
+                       for (auto i: JobManager::instance()->get()) {
                                films.insert (i->film());
                        }
 
-                       BOOST_FOREACH (shared_ptr<const Film> i, films) {
+                       for (auto i: films) {
                                double progress = 0;
-                               BOOST_FOREACH (shared_ptr<Job> j, JobManager::instance()->get()) {
+                               for (auto j: JobManager::instance()->get()) {
                                        if (i == j->film() && dynamic_pointer_cast<TranscodeJob>(j)) {
                                                progress = j->progress().get_value_or(0);
                                        }
@@ -382,6 +384,8 @@ class App : public wxApp
 {
        bool OnInit ()
        {
+               wxInitAllImageHandlers ();
+
                SetAppName (_("DCP-o-matic Batch Converter"));
                is_batch_converter = true;
 
@@ -433,7 +437,7 @@ class App : public wxApp
                this->Bind (wxEVT_IDLE, boost::bind (&App::idle, this));
 
                shared_ptr<Film> film;
-               BOOST_FOREACH (boost::filesystem::path i, films_to_load) {
+               for (auto i: films_to_load) {
                        if (boost::filesystem::is_directory (i)) {
                                try {
                                        film.reset (new Film (i));