projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix windows build
[dcpomatic.git]
/
src
/
lib
/
transcode_job.cc
diff --git
a/src/lib/transcode_job.cc
b/src/lib/transcode_job.cc
index 4a2d768f479c7c67fa600ef46c56954d5a60bae2..7d11d51a9589c474306068fbafd47f20eb05ed6f 100644
(file)
--- a/
src/lib/transcode_job.cc
+++ b/
src/lib/transcode_job.cc
@@
-21,18
+21,19
@@
* @brief A job which transcodes from one format to another.
*/
* @brief A job which transcodes from one format to another.
*/
-#include <iostream>
-#include <iomanip>
#include "transcode_job.h"
#include "film.h"
#include "transcoder.h"
#include "log.h"
#include "safe_stringstream.h"
#include "transcode_job.h"
#include "film.h"
#include "transcoder.h"
#include "log.h"
#include "safe_stringstream.h"
+#include "compose.hpp"
+#include <iostream>
+#include <iomanip>
#include "i18n.h"
#include "i18n.h"
-#define LOG_GENERAL_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_GENERAL);
-#define LOG_ERROR_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_ERROR);
+#define LOG_GENERAL_NC(...) _film->log()->log (__VA_ARGS__, Log
Entry
::TYPE_GENERAL);
+#define LOG_ERROR_NC(...) _film->log()->log (__VA_ARGS__, Log
Entry
::TYPE_ERROR);
using std::string;
using std::fixed;
using std::string;
using std::fixed;
@@
-99,7
+100,9
@@
TranscodeJob::status () const
if (!finished () && !_transcoder->finishing ()) {
/// TRANSLATORS: fps here is an abbreviation for frames per second
if (!finished () && !_transcoder->finishing ()) {
/// TRANSLATORS: fps here is an abbreviation for frames per second
- s << "; " << fixed << setprecision (1) << fps << " " << _("fps");
+ s << "; " << _transcoder->video_frames_out() << "/"
+ << _film->length().frames_round (_film->video_frame_rate ()) << " " << _("frames") << "; "
+ << fixed << setprecision (1) << fps << " " << _("fps");
}
return s.str ();
}
return s.str ();
@@
-123,5
+126,5
@@
TranscodeJob::remaining_time () const
}
/* Compute approximate proposed length here, as it's only here that we need it */
}
/* Compute approximate proposed length here, as it's only here that we need it */
- return (_film->length().frames (_film->video_frame_rate ()) - t->video_frames_out()) / fps;
+ return (_film->length().frames
_round
(_film->video_frame_rate ()) - t->video_frames_out()) / fps;
}
}