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 4ffdd9af6b815cbe6c572d1e72a336e82ce0445b..a29e7877666fc3c18ac82812f9f7247120dda0c0 100644
(file)
--- a/
src/lib/ab_transcode_job.cc
+++ b/
src/lib/ab_transcode_job.cc
@@
-20,11
+20,9
@@
#include <stdexcept>
#include "ab_transcode_job.h"
#include "film.h"
#include <stdexcept>
#include "ab_transcode_job.h"
#include "film.h"
-#include "format.h"
-#include "filter.h"
#include "ab_transcoder.h"
#include "config.h"
#include "ab_transcoder.h"
#include "config.h"
-#include "
encoder
.h"
+#include "
log
.h"
#include "i18n.h"
#include "i18n.h"
@@
-32,15
+30,14
@@
using std::string;
using boost::shared_ptr;
/** @param f Film to compare.
using boost::shared_ptr;
/** @param f Film to compare.
- * @param o Decode options.
*/
*/
-ABTranscodeJob::ABTranscodeJob (shared_ptr<Film> f
, DecodeOptions o
)
+ABTranscodeJob::ABTranscodeJob (shared_ptr<Film> f)
: Job (f)
: 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 ());
- _film_b->set_filters (Config::instance()->reference_filters ());
+ /* XXX */
+// _film_b->set_filters (Config::instance()->reference_filters ());
}
string
}
string
@@
-54,14
+51,18
@@
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, shared_ptr<Encoder> (new Encoder (_film)
));
+ 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);
+ _film->log()->log ("A/B transcode job completed successfully");
+
} catch (std::exception& e) {
} catch (std::exception& e) {
+ set_progress (1);
set_state (FINISHED_ERROR);
set_state (FINISHED_ERROR);
-
+ _film->log()->log (String::compose ("A/B transcode job failed (%1)", e.what()));
+ throw;
}
}
}
}