Merge master.

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

diff --git a/src/wx/job_wrapper.cc b/src/wx/job_wrapper.cc
index ad83aa271da0d8c43d08b7fe6b9b5c67aeeee58e..4c4ef049b8156ceda036ce3600235a0dc2ac2b5b 100644 (file)
--- a/src/wx/job_wrapper.cc
+++ b/src/wx/job_wrapper.cc
@@ -17,30 +17,25 @@
 
 */
 
-#include <sstream>
 #include "lib/film.h"
 #include "lib/exceptions.h"
 #include "job_wrapper.h"
 #include "wx_util.h"
 
-using namespace std;
+using boost::shared_ptr;
 
 void
-JobWrapper::make_dcp (wxWindow* parent, 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) {
-               stringstream s;
-               s << "Bad setting for " << e.setting() << "(" << e.what() << ")";
-               error_dialog (parent, s.str ());
+               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) {
-               stringstream s;
-               s << "Could not make DCP: " << e.what () << ".";
-               error_dialog (parent, s.str ());
+               error_dialog (parent, wxString::Format (_("Could not make DCP: %s"), std_to_wx(e.what()).data()));
        }
 }