projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Default to making SMPTE DCPs on new installs.
[dcpomatic.git]
/
src
/
lib
/
transcode_job.cc
diff --git
a/src/lib/transcode_job.cc
b/src/lib/transcode_job.cc
index 7fe28d210873abd328b75b212da1154e915731a4..48a2c8114960daa64d69e725becc60ffdd3cbd5c 100644
(file)
--- a/
src/lib/transcode_job.cc
+++ b/
src/lib/transcode_job.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-20
19
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
20
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-22,6
+22,7
@@
* @brief A job which transcodes from one format to another.
*/
* @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"
#include "transcode_job.h"
#include "dcp_encoder.h"
#include "upload_job.h"
@@
-41,9
+42,9
@@
using std::string;
using std::fixed;
using std::setprecision;
using std::cout;
using std::fixed;
using std::setprecision;
using std::cout;
-using
boost
::shared_ptr;
+using
std
::shared_ptr;
using boost::optional;
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)
/** @param film Film to use */
TranscodeJob::TranscodeJob (shared_ptr<const Film> film)
@@
-54,9
+55,6
@@
TranscodeJob::TranscodeJob (shared_ptr<const Film> film)
TranscodeJob::~TranscodeJob ()
{
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 ();
}
stop_thread ();
}
@@
-104,7
+102,7
@@
TranscodeJob::run ()
}
/* XXX: this shouldn't be here */
}
/* 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);
}
shared_ptr<Job> job (new UploadJob (_film));
JobManager::instance()->add (job);
}