projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
transcode_job.cc
diff --git
a/src/lib/transcode_job.cc
b/src/lib/transcode_job.cc
index e9a59c743ad3fc81e12abceb3c320f11a4db485d..f7cc500fe2fead1ef78cef63ff353abf67ac62ef 100644
(file)
--- a/
src/lib/transcode_job.cc
+++ b/
src/lib/transcode_job.cc
@@
-30,6
+30,8
@@
#include "log.h"
#include "encoder.h"
#include "log.h"
#include "encoder.h"
+#include "i18n.h"
+
using std::string;
using std::stringstream;
using std::fixed;
using std::string;
using std::stringstream;
using std::fixed;
@@
-38,10
+40,9
@@
using boost::shared_ptr;
/** @param s Film to use.
* @param o Decode options.
/** @param s Film to use.
* @param o Decode options.
- * @param req Job that must be completed before this job is run.
*/
*/
-TranscodeJob::TranscodeJob (shared_ptr<Film> f, DecodeOptions o
, shared_ptr<Job> req
)
- : Job (f
, req
)
+TranscodeJob::TranscodeJob (shared_ptr<Film> f, DecodeOptions o)
+ : Job (f)
, _decode_opt (o)
{
, _decode_opt (o)
{
@@
-50,7
+51,7
@@
TranscodeJob::TranscodeJob (shared_ptr<Film> f, DecodeOptions o, shared_ptr<Job>
string
TranscodeJob::name () const
{
string
TranscodeJob::name () const
{
- return String::compose (
"Transcode %1"
, _film->name());
+ return String::compose (
_("Transcode %1")
, _film->name());
}
void
}
void
@@
-58,8
+59,8
@@
TranscodeJob::run ()
{
try {
{
try {
- _film->log()->log (
"Transcode job starting"
);
- _film->log()->log (String::compose (
"Audio delay is %1ms"
, _film->audio_delay()));
+ _film->log()->log (
N_("Transcode job starting")
);
+ _film->log()->log (String::compose (
N_("Audio delay is %1ms")
, _film->audio_delay()));
_encoder.reset (new Encoder (_film));
Transcoder w (_film, _decode_opt, this, _encoder);
_encoder.reset (new Encoder (_film));
Transcoder w (_film, _decode_opt, this, _encoder);
@@
-69,14
+70,14
@@
TranscodeJob::run ()
_film->set_dcp_intrinsic_duration (_encoder->video_frames_out ());
_film->set_dcp_intrinsic_duration (_encoder->video_frames_out ());
- _film->log()->log (
"Transcode job completed successfully"
);
- _film->log()->log (String::compose (
"DCP intrinsic duration is %1"
, _encoder->video_frames_out()));
+ _film->log()->log (
N_("Transcode job completed successfully")
);
+ _film->log()->log (String::compose (
N_("DCP intrinsic duration is %1")
, _encoder->video_frames_out()));
} catch (std::exception& e) {
set_progress (1);
set_state (FINISHED_ERROR);
} catch (std::exception& e) {
set_progress (1);
set_state (FINISHED_ERROR);
- _film->log()->log (String::compose (
"Transcode job failed (%1)"
, e.what()));
+ _film->log()->log (String::compose (
N_("Transcode job failed (%1)")
, e.what()));
throw;
}
throw;
}
@@
-86,7
+87,7
@@
string
TranscodeJob::status () const
{
if (!_encoder) {
TranscodeJob::status () const
{
if (!_encoder) {
- return
"0%"
;
+ return
_("0%")
;
}
float const fps = _encoder->current_frames_per_second ();
}
float const fps = _encoder->current_frames_per_second ();
@@
-99,7
+100,7
@@
TranscodeJob::status () const
s << Job::status ();
if (!finished ()) {
s << Job::status ();
if (!finished ()) {
- s <<
"; " << fixed << setprecision (1) << fps << " frames per second"
;
+ s <<
N_("; ") << fixed << setprecision (1) << fps << N_(" ") << _("frames per second")
;
}
return s.str ();
}
return s.str ();
@@
-119,8
+120,8
@@
TranscodeJob::remaining_time () const
/* Compute approximate proposed length here, as it's only here that we need it */
int length = _film->length().get();
/* Compute approximate proposed length here, as it's only here that we need it */
int length = _film->length().get();
-
DCPFrameRate const dfr (_film->frames_per_second
());
- if (
dfr
.skip) {
+
FrameRateConversion const frc (_film->source_frame_rate(), _film->dcp_frame_rate
());
+ if (
frc
.skip) {
length /= 2;
}
/* If we are repeating it shouldn't affect transcode time, so don't take it into account */
length /= 2;
}
/* If we are repeating it shouldn't affect transcode time, so don't take it into account */