diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-10-16 16:30:11 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-10-16 16:30:11 +0100 |
| commit | 0b6c6de07f9a3aa28c2e8ca8ef30340e3fa1bfc6 (patch) | |
| tree | 075a7a604bbd4e072ec1b07481d4eb82ed7ffd34 /src/lib/transcode_job.cc | |
| parent | 42a122334d594b824c666e5263168386a76801cc (diff) | |
| parent | 016a98b18d01276a1e603885a25785e7389f14d9 (diff) | |
Merge branch 'master' into 12bit
Diffstat (limited to 'src/lib/transcode_job.cc')
| -rw-r--r-- | src/lib/transcode_job.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc index ef15f9f5e..831c74b3b 100644 --- a/src/lib/transcode_job.cc +++ b/src/lib/transcode_job.cc @@ -27,6 +27,7 @@ #include "film.h" #include "transcoder.h" #include "log.h" +#include "safe_stringstream.h" #include "i18n.h" @@ -34,7 +35,6 @@ #define LOG_ERROR_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_ERROR); using std::string; -using std::stringstream; using std::fixed; using std::setprecision; using boost::shared_ptr; @@ -53,12 +53,6 @@ TranscodeJob::name () const return String::compose (_("Transcode %1"), _film->name()); } -string -TranscodeJob::json_name () const -{ - return N_("transcode"); -} - void TranscodeJob::run () { @@ -95,7 +89,7 @@ TranscodeJob::status () const return Job::status (); } - stringstream s; + SafeStringStream s; s << Job::status (); |