Hand-apply d1bffe67820adaa10654f722b15eebdd773b3680; remove unnecessary JobWrapper...

diff --git a/TO_PORT b/TO_PORT
index 3a54c0d1ea606971cc0394924fd0b7ad46bea79c..7ed2707565d5df3908f76947de318027c1b77c85 100644 (file)
--- a/TO_PORT
+++ b/TO_PORT
@@ -1,4 +1,3 @@
-250ff9430c5e3727e2c5e24f81bc6d05a8700b49
 df4337db7d2f94f430caaf1b89f41dfae777799b
 46db828eab42862bf950b4690d9ad191faf9393e
 6921fc71f40fcebe76dad45ffc6204f2e3313e17

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 1a05ed2cbf8876203d682f0e26d462e35d87b664..ae0c25591d642c99b247b04ab5a7dc83d7584be3 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -36,7 +36,6 @@
 #include "wx/film_editor.h"
 #include "wx/job_manager_view.h"
 #include "wx/config_dialog.h"
-#include "wx/job_wrapper.h"
 #include "wx/wx_util.h"
 #include "wx/new_film_dialog.h"
 #include "wx/properties_dialog.h"
@@ -399,8 +398,14 @@ private:
                                return;
                        }
                }
-               
-               JobWrapper::make_dcp (this, _film);
+
+               try {
+                       _film->make_dcp ();
+               } catch (BadSettingError& e) {
+                       error_dialog (this, wxString::Format (_("Bad setting for %s (%s)"), std_to_wx(e.setting()).data(), std_to_wx(e.what()).data()));
+               } catch (std::exception& e) {
+                       error_dialog (this, wxString::Format (_("Could not make DCP: %s"), std_to_wx(e.what()).data()));
+               }
        }
 
        void jobs_make_kdms ()

diff --git a/src/wx/job_wrapper.cc b/src/wx/job_wrapper.cc
deleted file mode 100644 (file)
index 4c4ef04..0000000
--- a/src/wx/job_wrapper.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-    Copyright (C) 2012 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include "lib/film.h"
-#include "lib/exceptions.h"
-#include "job_wrapper.h"
-#include "wx_util.h"
-
-using boost::shared_ptr;
-
-void
-JobWrapper::make_dcp (wxWindow* parent, shared_ptr<Film> film)
-{
-       if (!film) {
-               return;
-       }
-
-       try {
-               film->make_dcp ();
-       } catch (BadSettingError& e) {
-               error_dialog (parent, wxString::Format (_("Bad setting for %s (%s)"), std_to_wx(e.setting()).data(), std_to_wx(e.what()).data()));
-       } catch (std::exception& e) {
-               error_dialog (parent, wxString::Format (_("Could not make DCP: %s"), std_to_wx(e.what()).data()));
-       }
-}

diff --git a/src/wx/job_wrapper.h b/src/wx/job_wrapper.h
deleted file mode 100644 (file)
index b0a4693..0000000
--- a/src/wx/job_wrapper.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
-    Copyright (C) 2012 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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include <wx/wx.h>
-
-class Film;
-
-namespace JobWrapper
-{
-
-void make_dcp (wxWindow *, boost::shared_ptr<Film>);
-       
-}

diff --git a/src/wx/wscript b/src/wx/wscript
index 6a72f858d31ba83c63118a094d45b3df631c91e5..38448cfb2225551ac0b354e6865e787efba813f4 100644 (file)
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -31,7 +31,6 @@ sources = """
           gain_calculator_dialog.cc
           hints_dialog.cc
           job_manager_view.cc
-          job_wrapper.cc
           kdm_dialog.cc
           make_signer_chain_dialog.cc
           new_film_dialog.cc