X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fjob.cc;h=1d3cb73b6fcf39f276e9aefc3fbdd91841397051;hb=8c7a308c03e4b4196b4e2379a26d432b100ae2b1;hp=594c0da34f1b5cdc7a55177e61bee698b5ac21d5;hpb=04eebe07e2f64bd15f6887a10ab51fb92c52901a;p=dcpomatic.git diff --git a/src/lib/job.cc b/src/lib/job.cc index 594c0da34..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 f) @@ -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