Hand-apply d1bffe67820adaa10654f722b15eebdd773b3680; remove unnecessary JobWrapper stuff.

4 files changed, 8 insertions, 74 deletions

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 1a05ed2cb..ae0c25591 100644
--- 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
index 4c4ef049b..000000000
--- 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
index b0a4693dd..000000000
--- 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 6a72f858d..38448cfb2 100644
--- 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