Various Doxygen fixes.

[dcpomatic.git] / src / lib / transcode_job.cc

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 4eb2b1d290d6c6ed7d8c29adc7de2cd9c1e46f49..17108c27887917fd7ae11dfd94c688ba707980c2 100644 (file)
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -44,8 +44,7 @@ using std::setprecision;
 using std::cout;
 using boost::shared_ptr;
 
-/** @param s Film to use.
- */
+/** @param film Film to use */
 TranscodeJob::TranscodeJob (shared_ptr<const Film> film)
        : Job (film)
 {
@@ -106,23 +105,25 @@ TranscodeJob::status () const
                return Job::status ();
        }
 
-       float const fps = _transcoder->current_encoding_rate ();
-       if (fps == 0) {
-               return Job::status ();
-       }
 
        char buffer[256];
        if (finished() || _transcoder->finishing()) {
                strncpy (buffer, Job::status().c_str(), 256);
        } else {
-               /// TRANSLATORS: fps here is an abbreviation for frames per second
                snprintf (
-                       buffer, sizeof(buffer), "%s; %d/%" PRId64 " frames; %.1f fps",
+                       buffer, sizeof(buffer), "%s; %d/%" PRId64 " frames",
                        Job::status().c_str(),
                        _transcoder->video_frames_enqueued(),
-                       _film->length().frames_round (_film->video_frame_rate ()),
-                       fps
+                       _film->length().frames_round (_film->video_frame_rate ())
                        );
+
+               float const fps = _transcoder->current_encoding_rate ();
+               if (fps) {
+                       char fps_buffer[64];
+                       /// TRANSLATORS: fps here is an abbreviation for frames per second
+                       snprintf (fps_buffer, sizeof(fps_buffer), _("; %.1f fps"), fps);
+                       strncat (buffer, fps_buffer, strlen(buffer) - 1);
+               }
        }
 
        return buffer;