projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add FFmpeg content dialog; moving ffmpeg-specific things out of the film editor.
[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 da9ce7933cfe39cd9f3dc46b860a20fc95fbcb09..2bdff47de684827ab0e0ec15664737cb624609ed 100644
(file)
--- 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 "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 Options.
*/
*/
-ABTranscodeJob::ABTranscodeJob (shared_ptr<Film> f, shared_ptr<const DecodeOptions> od, shared_ptr<const EncodeOptions> oe, shared_ptr<Job> req)
- : Job (f, req)
- , _decode_opt (od)
- , _encode_opt (oe)
+ABTranscodeJob::ABTranscodeJob (shared_ptr<Film> f)
+ : Job (f)
{
_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
+44,7
@@
ABTranscodeJob::ABTranscodeJob (shared_ptr<Film> f, shared_ptr<const DecodeOptio
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
+52,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,
_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);
w.go ();
set_progress (1);
set_state (FINISHED_OK);