No-op: remove all trailing whitespace.

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

diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc
index de255e65edaeab43959800f8639232f87b5272ea..48ef8f798e1f413881032a9bd06b8ba7ea901799 100644 (file)
--- a/src/tools/dcpomatic_batch.cc
+++ b/src/tools/dcpomatic_batch.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -29,7 +29,7 @@
 #include "lib/job_manager.h"
 #include "wx/wx_util.h"
 #include "wx/about_dialog.h"
-#include "wx/wx_ui_signaller.h"
+#include "wx/wx_signal_manager.h"
 #include "wx/job_manager_view.h"
 
 using std::exception;
@@ -57,10 +57,10 @@ setup_menu (wxMenuBar* m)
        m->Append (help, _("&Help"));
 }
 
-class Frame : public wxFrame
+class DOMFrame : public wxFrame
 {
 public:
-       Frame (wxString const & title)
+       DOMFrame (wxString const & title)
                : wxFrame (NULL, -1, title)
                , _sizer (new wxBoxSizer (wxVERTICAL))
        {
@@ -68,29 +68,29 @@ public:
                setup_menu (bar);
                SetMenuBar (bar);
 
-               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::file_add_film, this), ID_file_add_film);
-               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::file_quit, this),     ID_file_quit);
-               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::help_about, this),    ID_help_about);
+               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::file_add_film, this), ID_file_add_film);
+               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::file_quit, this),     ID_file_quit);
+               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::help_about, this),    ID_help_about);
 
                wxPanel* panel = new wxPanel (this);
                wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
                s->Add (panel, 1, wxEXPAND);
                SetSizer (s);
 
-               JobManagerView* job_manager_view = new JobManagerView (panel, JobManagerView::PAUSE);
+               JobManagerView* job_manager_view = new JobManagerView (panel);
                _sizer->Add (job_manager_view, 1, wxALL | wxEXPAND, 6);
 
                wxSizer* buttons = new wxBoxSizer (wxHORIZONTAL);
                wxButton* add = new wxButton (panel, wxID_ANY, _("Add Film..."));
-               add->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&Frame::add_film, this));
+               add->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DOMFrame::add_film, this));
                buttons->Add (add, 1, wxALL, 6);
 
                _sizer->Add (buttons, 0, wxALL, 6);
 
                panel->SetSizer (_sizer);
 
-               Bind (wxEVT_CLOSE_WINDOW, boost::bind (&Frame::close, this, _1));
-               Bind (wxEVT_SIZE, boost::bind (&Frame::sized, this, _1));
+               Bind (wxEVT_CLOSE_WINDOW, boost::bind (&DOMFrame::close, this, _1));
+               Bind (wxEVT_SIZE, boost::bind (&DOMFrame::sized, this, _1));
        }
 
 private:
@@ -99,7 +99,7 @@ private:
                _sizer->Layout ();
                ev.Skip ();
        }
-       
+
        bool should_close ()
        {
                if (!JobManager::instance()->work_to_do ()) {
@@ -117,7 +117,7 @@ private:
                d->Destroy ();
                return r;
        }
-               
+
        void close (wxCloseEvent& ev)
        {
                if (!should_close ()) {
@@ -132,7 +132,7 @@ private:
        {
                add_film ();
        }
-       
+
        void file_quit ()
        {
                if (should_close ()) {
@@ -153,7 +153,7 @@ private:
                if (_last_parent) {
                        c->SetPath (std_to_wx (_last_parent.get().string ()));
                }
-               
+
                int r;
                while (true) {
                        r = c->ShowModal ();
@@ -163,7 +163,7 @@ private:
                                break;
                        }
                }
-                       
+
                if (r == wxID_OK) {
                        try {
                                shared_ptr<Film> film (new Film (wx_to_std (c->GetPath ())));
@@ -197,20 +197,20 @@ class App : public wxApp
                if (!wxApp::OnInit()) {
                        return false;
                }
-               
-#ifdef DCPOMATIC_LINUX         
+
+#ifdef DCPOMATIC_LINUX
                unsetenv ("UBUNTU_MENUPROXY");
-#endif         
+#endif
 
                /* Enable i18n; this will create a Config object
                   to look for a force-configured language.  This Config
                   object will be wrong, however, because dcpomatic_setup
-                  hasn't yet been called and there aren't any scalers, filters etc.
+                  hasn't yet been called and there aren't any filters etc.
                   set up yet.
                */
                dcpomatic_setup_i18n ();
 
-               /* Set things up, including scalers / filters etc.
+               /* Set things up, including filters etc.
                   which will now be internationalised correctly.
                */
                dcpomatic_setup ();
@@ -220,12 +220,12 @@ class App : public wxApp
                */
                Config::drop ();
 
-               Frame* f = new Frame (_("DCP-o-matic Batch Converter"));
+               DOMFrame* f = new DOMFrame (_("DCP-o-matic Batch Converter"));
                SetTopWindow (f);
                f->Maximize ();
                f->Show ();
 
-               ui_signaller = new wxUISignaller (this);
+               signal_manager = new wxSignalManager (this);
                this->Bind (wxEVT_IDLE, boost::bind (&App::idle, this));
 
                shared_ptr<Film> film;
@@ -244,7 +244,7 @@ class App : public wxApp
 
        void idle ()
        {
-               ui_signaller->ui_idle ();
+               signal_manager->ui_idle ();
        }
 
        void OnInitCmdLine (wxCmdLineParser& parser)