#include "i18n.h"
+#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;
void
SCPDCPJob::run ()
{
- _film->log()->log (N_("SCP DCP job starting"));
+ LOG_GENERAL_NC (N_("SCP DCP job starting"));
SSHSession ss;
}
to_do -= t;
bytes_transferred += t;
-
- set_progress ((double) bytes_transferred / bytes_to_transfer);
+
+ if (bytes_to_transfer > 0) {
+ set_progress ((double) bytes_transferred / bytes_to_transfer);
+ }
}
fclose (f);
SCPDCPJob::status () const
{
boost::mutex::scoped_lock lm (_status_mutex);
- stringstream s;
- s << Job::status ();
+ string s = Job::status ();
if (!_status.empty ()) {
- s << N_("; ") << _status;
+ s += N_("; ") + _status;
}
- return s.str ();
+ return s;
}
void
boost::mutex::scoped_lock lm (_status_mutex);
_status = s;
}
-