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
/
lib
/
scp_dcp_job.cc
diff --git
a/src/lib/scp_dcp_job.cc
b/src/lib/scp_dcp_job.cc
index 22715978a7040ba279843c8e2ab0488a8f98f7a3..67a1fb8026a68325b768a86fa1808dd258345490 100644
(file)
--- a/
src/lib/scp_dcp_job.cc
+++ b/
src/lib/scp_dcp_job.cc
@@
-37,8
+37,9
@@
#include "i18n.h"
#include "i18n.h"
+#define LOG_GENERAL_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_GENERAL);
+
using std::string;
using std::string;
-using std::stringstream;
using std::min;
using boost::shared_ptr;
using std::min;
using boost::shared_ptr;
@@
-113,7
+114,7
@@
SCPDCPJob::name () const
void
SCPDCPJob::run ()
{
void
SCPDCPJob::run ()
{
-
_film->log()->log
(N_("SCP DCP job starting"));
+
LOG_GENERAL_NC
(N_("SCP DCP job starting"));
SSHSession ss;
SSHSession ss;
@@
-209,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
@@
-223,4
+223,3
@@
SCPDCPJob::set_status (string s)
boost::mutex::scoped_lock lm (_status_mutex);
_status = s;
}
boost::mutex::scoped_lock lm (_status_mutex);
_status = s;
}
-