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 cb02ecd0257dbddd771e80d131d2cc9f799d4a49..df4aa7d2e78a740c786caffb1250a798c065a864 100644
(file)
--- a/
src/wx/job_wrapper.cc
+++ b/
src/wx/job_wrapper.cc
@@
-26,17
+26,17
@@
using boost::shared_ptr;
void
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 {
{
if (!film) {
return;
}
try {
- film->make_dcp (
transcode
);
+ film->make_dcp ();
} catch (BadSettingError& e) {
} 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) {
} 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
()));
}
}
}
}