X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fab_transcode_job.cc;h=2bdff47de684827ab0e0ec15664737cb624609ed;hb=8a1042b767e2604b0af4850dd69fd6a848fd6ffe;hp=da9ce7933cfe39cd9f3dc46b860a20fc95fbcb09;hpb=54a9c84e2b4d69b1e6ed669400f84b1604cc2369;p=dcpomatic.git diff --git a/src/lib/ab_transcode_job.cc b/src/lib/ab_transcode_job.cc index da9ce7933..2bdff47de 100644 --- a/src/lib/ab_transcode_job.cc +++ b/src/lib/ab_transcode_job.cc @@ -23,19 +23,18 @@ #include "format.h" #include "filter.h" #include "ab_transcoder.h" -#include "encoder_factory.h" #include "config.h" +#include "encoder.h" + +#include "i18n.h" using std::string; using boost::shared_ptr; /** @param f Film to compare. - * @param o Options. */ -ABTranscodeJob::ABTranscodeJob (shared_ptr f, shared_ptr od, shared_ptr oe, shared_ptr req) - : Job (f, req) - , _decode_opt (od) - , _encode_opt (oe) +ABTranscodeJob::ABTranscodeJob (shared_ptr f) + : Job (f) { _film_b.reset (new Film (*_film)); _film_b->set_scaler (Config::instance()->reference_scaler ()); @@ -45,7 +44,7 @@ ABTranscodeJob::ABTranscodeJob (shared_ptr f, shared_ptrname()); + return String::compose (_("A/B transcode %1"), _film->name()); } void @@ -53,7 +52,7 @@ ABTranscodeJob::run () { try { /* _film_b is the one with reference filters */ - ABTranscoder w (_film_b, _film, _decode_opt, this, encoder_factory (_film, _encode_opt)); + ABTranscoder w (_film_b, _film, shared_from_this ()); w.go (); set_progress (1); set_state (FINISHED_OK);