projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
wx
/
job_wrapper.cc
diff --git
a/src/wx/job_wrapper.cc
b/src/wx/job_wrapper.cc
index cc7507547b8172dc9585629ee1b11ba7eb146a64..4c4ef049b8156ceda036ce3600235a0dc2ac2b5b 100644
(file)
--- a/
src/wx/job_wrapper.cc
+++ b/
src/wx/job_wrapper.cc
@@
-17,26
+17,25
@@
*/
*/
-#include <sstream>
#include "lib/film.h"
#include "lib/exceptions.h"
#include "job_wrapper.h"
#include "wx_util.h"
#include "lib/film.h"
#include "lib/exceptions.h"
#include "job_wrapper.h"
#include "wx_util.h"
-using
namespace std
;
+using
boost::shared_ptr
;
void
void
-JobWrapper::make_dcp (wxWindow* parent,
Film* film, bool transcode
)
+JobWrapper::make_dcp (wxWindow* parent,
shared_ptr<Film> film
)
{
if (!film) {
return;
}
try {
{
if (!film) {
return;
}
try {
- film->make_dcp (
transcode
);
+ film->make_dcp ();
} catch (BadSettingError& e) {
} catch (BadSettingError& e) {
- error_dialog (parent,
String::compose ("Bad setting for %1 (%2)", e.setting(), 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) {
} catch (std::exception& e) {
- error_dialog (parent,
String::compose ("Could not make DCP: %1", e.what
()));
+ error_dialog (parent,
wxString::Format (_("Could not make DCP: %s"), std_to_wx(e.what()).data
()));
}
}
}
}