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
/
ab_transcode_job.cc
diff --git
a/src/lib/ab_transcode_job.cc
b/src/lib/ab_transcode_job.cc
index 0efd277bb73799a76fdbf0f68aec04e36f7ab2d0..4ffdd9af6b815cbe6c572d1e72a336e82ce0445b 100644
(file)
--- a/
src/lib/ab_transcode_job.cc
+++ b/
src/lib/ab_transcode_job.cc
@@
-26,14
+26,16
@@
#include "config.h"
#include "encoder.h"
#include "config.h"
#include "encoder.h"
+#include "i18n.h"
+
using std::string;
using boost::shared_ptr;
/** @param f Film to compare.
* @param o Decode options.
*/
using std::string;
using boost::shared_ptr;
/** @param f Film to compare.
* @param o Decode options.
*/
-ABTranscodeJob::ABTranscodeJob (shared_ptr<Film> f, DecodeOptions o
, shared_ptr<Job> req
)
- : Job (f
, req
)
+ABTranscodeJob::ABTranscodeJob (shared_ptr<Film> f, DecodeOptions o)
+ : Job (f)
, _decode_opt (o)
{
_film_b.reset (new Film (*_film));
, _decode_opt (o)
{
_film_b.reset (new Film (*_film));
@@
-44,7
+46,7
@@
ABTranscodeJob::ABTranscodeJob (shared_ptr<Film> f, DecodeOptions o, shared_ptr<
string
ABTranscodeJob::name () const
{
string
ABTranscodeJob::name () const
{
- return String::compose (
"A/B transcode %1"
, _film->name());
+ return String::compose (
_("A/B transcode %1")
, _film->name());
}
void
}
void