projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Forward-port 99% crash fix from 1.x.
[dcpomatic.git]
/
src
/
lib
/
scp_dcp_job.cc
diff --git
a/src/lib/scp_dcp_job.cc
b/src/lib/scp_dcp_job.cc
index 63784081356e9eb0fc4d81ea97d551a7078e224d..67a1fb8026a68325b768a86fa1808dd258345490 100644
(file)
--- a/
src/lib/scp_dcp_job.cc
+++ b/
src/lib/scp_dcp_job.cc
@@
-40,7
+40,6
@@
#define LOG_GENERAL_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_GENERAL);
using std::string;
#define LOG_GENERAL_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_GENERAL);
using std::string;
-using std::stringstream;
using std::min;
using boost::shared_ptr;
using std::min;
using boost::shared_ptr;
@@
-112,12
+111,6
@@
SCPDCPJob::name () const
return _("Copy DCP to TMS");
}
return _("Copy DCP to TMS");
}
-string
-SCPDCPJob::json_name () const
-{
- return N_("scp_dcp");
-}
-
void
SCPDCPJob::run ()
{
void
SCPDCPJob::run ()
{
@@
-217,12
+210,11
@@
string
SCPDCPJob::status () const
{
boost::mutex::scoped_lock lm (_status_mutex);
SCPDCPJob::status () const
{
boost::mutex::scoped_lock lm (_status_mutex);
- stringstream s;
- s << Job::status ();
+ string s = Job::status ();
if (!_status.empty ()) {
if (!_status.empty ()) {
- s
<< N_("; ") <<
_status;
+ s
+= N_("; ") +
_status;
}
}
- return s
.str ()
;
+ return s;
}
void
}
void