/*
- Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
* @brief A job which transcodes from one format to another.
*/
+#include "config.h"
#include "transcode_job.h"
#include "dcp_encoder.h"
#include "upload_job.h"
using std::fixed;
using std::setprecision;
using std::cout;
-using boost::shared_ptr;
+using std::shared_ptr;
using boost::optional;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
/** @param film Film to use */
TranscodeJob::TranscodeJob (shared_ptr<const Film> film)
TranscodeJob::~TranscodeJob ()
{
- /* We have to stop the job thread here as we're about to start tearing down
- the Encoder, which is bad news if the job thread is still feeding it data.
- */
stop_thread ();
}
DCPOMATIC_ASSERT (_encoder);
_encoder->go ();
- set_progress (1);
- set_state (FINISHED_OK);
struct timeval finish;
gettimeofday (&finish, 0);
}
/* XXX: this shouldn't be here */
- if (_film->upload_after_make_dcp() && dynamic_pointer_cast<DCPEncoder>(_encoder)) {
+ if (Config::instance()->upload_after_make_dcp() && dynamic_pointer_cast<DCPEncoder>(_encoder)) {
shared_ptr<Job> job (new UploadJob (_film));
JobManager::instance()->add (job);
}
_encoder.reset ();
+ set_progress (1);
+ set_state (FINISHED_OK);
+
} catch (...) {
_encoder.reset ();
throw;