X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fjob.cc;h=1d3cb73b6fcf39f276e9aefc3fbdd91841397051;hb=5e4f001bf32e3cdf65efa34803d70e6c1c00c66b;hp=c6a6b90a808fcdd234c053ce1c21a31d3128d3eb;hpb=308488324dbc4d8b709d3fb1dc9fee0479346c21;p=dcpomatic.git

diff --git a/src/lib/job.cc b/src/lib/job.cc
index c6a6b90a8..1d3cb73b6 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -37,7 +37,6 @@
 using std::string;
 using std::list;
 using std::cout;
-using std::stringstream;
 using boost::shared_ptr;
 
 Job::Job (shared_ptr<const Film> f)
@@ -281,7 +280,7 @@ Job::error_summary () const
 void
 Job::set_error (string s, string d)
 {
-	_film->log()->log (String::compose ("Error in job: %1 (%2)", s, d));
+	_film->log()->log (String::compose ("Error in job: %1 (%2)", s, d), Log::TYPE_ERROR);
 	boost::mutex::scoped_lock lm (_state_mutex);
 	_error_summary = s;
 	_error_details = d;
@@ -309,7 +308,7 @@ Job::status () const
 		pc = 99;
 	}
 
-	stringstream s;
+	SafeStringStream s;
 	if (!finished ()) {
 		s << pc << N_("%");
 		if (p >= 0 && t > 10 && r > 0) {
@@ -328,29 +327,6 @@ Job::status () const
 	return s.str ();
 }
 
-string
-Job::json_status () const
-{
-	boost::mutex::scoped_lock lm (_state_mutex);
-
-	switch (_state) {
-	case NEW:
-		return N_("new");
-	case RUNNING:
-		return N_("running");
-	case PAUSED:
-		return N_("paused");
-	case FINISHED_OK:
-		return N_("finished_ok");
-	case FINISHED_ERROR:
-		return N_("finished_error");
-	case FINISHED_CANCELLED:
-		return N_("finished_cancelled");
-	}
-
-	return "";
-}
-
 /** @return An estimate of the remaining time for this sub-job, in seconds */
 int
 Job::remaining_time () const