/*
- Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
}
+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 ();
+}
+
string
TranscodeJob::name () const
{
Analytics::instance()->successful_dcp_encode();
}
- _encoder.reset ();
-
/* XXX: this shouldn't be here */
- if (_film->upload_after_make_dcp ()) {
+ if (_film->upload_after_make_dcp() && dynamic_pointer_cast<DCPEncoder>(_encoder)) {
shared_ptr<Job> job (new UploadJob (_film));
JobManager::instance()->add (job);
}
+ _encoder.reset ();
+
} catch (...) {
_encoder.reset ();
throw;
char buffer[256];
if (finished() || _encoder->finishing()) {
- strncpy (buffer, Job::status().c_str(), 256);
+ strncpy (buffer, Job::status().c_str(), 255);
+ buffer[255] = '\0';
} else {
snprintf (
buffer, sizeof(buffer), "%s; %" PRId64 "/%" PRId64 " frames",