projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More fr_FR tweaks from Lilian.
[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 c9fd5bc977fbc9bfe0640a04d655db1588f4a01f..4ffdd9af6b815cbe6c572d1e72a336e82ce0445b 100644
(file)
--- a/
src/lib/ab_transcode_job.cc
+++ b/
src/lib/ab_transcode_job.cc
@@
-19,23
+19,24
@@
#include <stdexcept>
#include "ab_transcode_job.h"
#include <stdexcept>
#include "ab_transcode_job.h"
-#include "j2k_wav_encoder.h"
#include "film.h"
#include "format.h"
#include "filter.h"
#include "ab_transcoder.h"
#include "film.h"
#include "format.h"
#include "filter.h"
#include "ab_transcoder.h"
-#include "encoder_factory.h"
#include "config.h"
#include "config.h"
+#include "encoder.h"
+
+#include "i18n.h"
using std::string;
using boost::shared_ptr;
/** @param f Film to compare.
using std::string;
using boost::shared_ptr;
/** @param f Film to compare.
- * @param o
O
ptions.
+ * @param o
Decode o
ptions.
*/
*/
-ABTranscodeJob::ABTranscodeJob (shared_ptr<Film> f,
shared_ptr<const Options> o, shared_ptr<Job> req
)
- : Job (f
, req
)
- , _opt (o)
+ABTranscodeJob::ABTranscodeJob (shared_ptr<Film> f,
DecodeOptions o
)
+ : Job (f)
+ , _
decode_
opt (o)
{
_film_b.reset (new Film (*_film));
_film_b->set_scaler (Config::instance()->reference_scaler ());
{
_film_b.reset (new Film (*_film));
_film_b->set_scaler (Config::instance()->reference_scaler ());
@@
-45,7
+46,7
@@
ABTranscodeJob::ABTranscodeJob (shared_ptr<Film> f, shared_ptr<const Options> o,
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
@@
-53,7
+54,7
@@
ABTranscodeJob::run ()
{
try {
/* _film_b is the one with reference filters */
{
try {
/* _film_b is the one with reference filters */
- ABTranscoder w (_film_b, _film, _
opt, this, encoder_factory (_film, _opt
));
+ ABTranscoder w (_film_b, _film, _
decode_opt, this, shared_ptr<Encoder> (new Encoder (_film)
));
w.go ();
set_progress (1);
set_state (FINISHED_OK);
w.go ();
set_progress (1);
set_state (FINISHED_OK);