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 2bdff47de684827ab0e0ec15664737cb624609ed..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 "format.h"
-#include "filter.h"
 #include "ab_transcoder.h"
 #include "config.h"
-#include "encoder.h"
+#include "log.h"
 
 #include "i18n.h"
 
@@ -38,7 +36,8 @@ ABTranscodeJob::ABTranscodeJob (shared_ptr<Film> f)
 {
        _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
@@ -57,9 +56,13 @@ ABTranscodeJob::run ()
                set_progress (1);
                set_state (FINISHED_OK);
 
+               _film->log()->log ("A/B transcode job completed successfully");
+
        } catch (std::exception& e) {
 
+               set_progress (1);
                set_state (FINISHED_ERROR);
-
+               _film->log()->log (String::compose ("A/B transcode job failed (%1)", e.what()));
+               throw;
        }
 }