summaryrefslogtreecommitdiff
path: root/src/lib/transcode_job.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-08-29 14:50:55 +0100
committerCarl Hetherington <cth@carlh.net>2013-08-29 14:50:55 +0100
commitb8724f408298ff3e804fb821fa15d3bcded0e3db (patch)
tree6b551ad6a7bc2845f105a5f44bc5151d9e600d1a /src/lib/transcode_job.cc
parente60d69b3462755c5f98a460688d391822fdc62fb (diff)
parent11619ba7fd5537407798c01c6ca299fb64422338 (diff)
Merge branch '1.0' of /home/carl/git/dvdomatic into 1.0
Diffstat (limited to 'src/lib/transcode_job.cc')
-rw-r--r--src/lib/transcode_job.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 6d5edd7c0..c9ec2053d 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -91,7 +91,12 @@ TranscodeJob::status () const
s << Job::status ();
if (!finished ()) {
- s << N_("; ") << fixed << setprecision (1) << fps << N_(" ") << _("frames per second");
+ if (_transcoder->state() == Encoder::TRANSCODING) {
+ s << "; " << fixed << setprecision (1) << fps << N_(" ") << _("frames per second");
+ } else {
+ /* TRANSLATORS: this means `computing a hash' as in a digest of a block of data */
+ s << "; " << _("hashing");
+ }
}
return s.str ();