Merge master.

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

diff --git a/src/wx/job_wrapper.cc b/src/wx/job_wrapper.cc
index cb02ecd0257dbddd771e80d131d2cc9f799d4a49..4c4ef049b8156ceda036ce3600235a0dc2ac2b5b 100644 (file)
--- a/src/wx/job_wrapper.cc
+++ b/src/wx/job_wrapper.cc
@@ -17,7 +17,6 @@
 
 */
 
-#include <sstream>
 #include "lib/film.h"
 #include "lib/exceptions.h"
 #include "job_wrapper.h"
@@ -26,17 +25,17 @@
 using boost::shared_ptr;
 
 void
-JobWrapper::make_dcp (wxWindow* parent, shared_ptr<Film> film, bool transcode)
+JobWrapper::make_dcp (wxWindow* parent, shared_ptr<Film> film)
 {
        if (!film) {
                return;
        }
 
        try {
-               film->make_dcp (transcode);
+               film->make_dcp ();
        } catch (BadSettingError& e) {
-               error_dialog (parent, wxString::Format (_("Bad setting for %s (%s)"), e.setting().c_str(), e.what()));
+               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"), e.what ()));
+               error_dialog (parent, wxString::Format (_("Could not make DCP: %s"), std_to_wx(e.what()).data()));
        }
 }