projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add AudioMapping::take_from().
[dcpomatic.git]
/
src
/
lib
/
combine_dcp_job.cc
diff --git
a/src/lib/combine_dcp_job.cc
b/src/lib/combine_dcp_job.cc
index b3c29b2056fe98b94e8f448c3c638ed3d32a57da..5c299492be9721d69705ebbc0c1952c6d7d59f31 100644
(file)
--- a/
src/lib/combine_dcp_job.cc
+++ b/
src/lib/combine_dcp_job.cc
@@
-20,6
+20,8
@@
#include "combine_dcp_job.h"
#include "combine_dcp_job.h"
+#include "compose.hpp"
+#include "config.h"
#include <dcp/combine.h>
#include <dcp/exceptions.h>
#include <dcp/combine.h>
#include <dcp/exceptions.h>
@@
-28,13
+30,14
@@
using std::string;
using std::vector;
using std::string;
using std::vector;
-using
boost
::shared_ptr;
+using
std
::shared_ptr;
-CombineDCPJob::CombineDCPJob (vector<boost::filesystem::path> inputs, boost::filesystem::path output)
+CombineDCPJob::CombineDCPJob (vector<boost::filesystem::path> inputs, boost::filesystem::path output
, string annotation_text
)
: Job (shared_ptr<Film>())
, _inputs (inputs)
, _output (output)
: Job (shared_ptr<Film>())
, _inputs (inputs)
, _output (output)
+ , _annotation_text (annotation_text)
{
}
{
}
@@
-58,7
+61,15
@@
void
CombineDCPJob::run ()
{
try {
CombineDCPJob::run ()
{
try {
- dcp::combine (_inputs, _output);
+ dcp::combine (
+ _inputs,
+ _output,
+ String::compose("libdcp %1", dcp::version),
+ String::compose("libdcp %1", dcp::version),
+ dcp::LocalTime().as_string(),
+ _annotation_text,
+ Config::instance()->signer_chain()
+ );
} catch (dcp::CombineError& e) {
set_state (FINISHED_ERROR);
set_error (e.what(), "");
} catch (dcp::CombineError& e) {
set_state (FINISHED_ERROR);
set_error (e.what(), "");