projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hand-apply 2ee558ec90623b570360e8e55c918b5bb37f9aac from master; various snapping...
[dcpomatic.git]
/
src
/
lib
/
transcode_job.cc
diff --git
a/src/lib/transcode_job.cc
b/src/lib/transcode_job.cc
index 4a85fa18aa8935d0a2c0ff5670f504de012b439e..1a2202ad2f2b91b9914297c07c9852ff227b3cb7 100644
(file)
--- 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 "film.h"
#include "transcoder.h"
#include "log.h"
+#include "safe_stringstream.h"
#include "i18n.h"
#include "i18n.h"
@@
-34,7
+35,6
@@
#define LOG_ERROR_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_ERROR);
using std::string;
#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 std::cout;
using std::fixed;
using std::setprecision;
using std::cout;
@@
-76,9
+76,6
@@
TranscodeJob::run ()
_transcoder.reset ();
} catch (...) {
_transcoder.reset ();
} catch (...) {
- set_progress (1);
- set_state (FINISHED_ERROR);
- LOG_ERROR_NC (N_("Transcode job failed or cancelled"));
_transcoder.reset ();
throw;
}
_transcoder.reset ();
throw;
}
@@
-96,12
+93,13
@@
TranscodeJob::status () const
return Job::status ();
}
return Job::status ();
}
-
strings
tream s;
+
SafeStringS
tream s;
s << Job::status ();
if (!finished () && !_transcoder->finishing ()) {
s << Job::status ();
if (!finished () && !_transcoder->finishing ()) {
- s << "; " << fixed << setprecision (1) << fps << " " << _("frames per second");
+ /// TRANSLATORS: fps here is an abbreviation for frames per second
+ s << "; " << fixed << setprecision (1) << fps << " " << _("fps");
}
return s.str ();
}
return s.str ();