summaryrefslogtreecommitdiff
path: root/src/lib/film.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-10-27 21:00:41 +0100
committerCarl Hetherington <cth@carlh.net>2016-10-31 11:34:16 +0000
commit83efe84020dc0ba2801c4b305448790720fe133f (patch)
treecbe46d9cbcad21e9495f2624e2c8c8f61e1ca0e3 /src/lib/film.h
parent5b04f870694373ad9c6086aed5ab38b0c6b41ccc (diff)
Use the same ContextID whenever encrypting the picture asset for a project;
this ensures that resumption of encodes works. Before this, a random ContextID would be created for each run (#980).
Diffstat (limited to 'src/lib/film.h')
-rw-r--r--src/lib/film.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/lib/film.h b/src/lib/film.h
index ad94852a2..2b700b007 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -284,6 +284,11 @@ public:
return _upload_after_make_dcp;
}
+ std::string context_id () const {
+ return _context_id;
+ }
+
+
/* SET */
void set_directory (boost::filesystem::path);
@@ -357,6 +362,10 @@ private:
bool _signed;
bool _encrypted;
dcp::Key _key;
+ /** context ID used when encrypting picture assets; we keep it so that we can
+ * re-start picture MXF encodes.
+ */
+ std::string _context_id;
/** bandwidth for J2K files in bits per second */
int _j2k_bandwidth;
/** ISDCF naming stuff */