summaryrefslogtreecommitdiff
path: root/src/lib/dcp_content.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-06-19 13:30:02 +0200
committerCarl Hetherington <cth@carlh.net>2020-06-19 13:42:24 +0200
commita0c931b6bfb05b56996a75bbfcf378cd44ef18e1 (patch)
treed02d8cb5ef0fd0f8ce0751bf17fab9c98ffd1868 /src/lib/dcp_content.cc
parentcabe0934c60fb6e74bf4c3023bdcb5c68753e5d9 (diff)
Make Atmos content work more like other content. Now its MXFsencrypt-atmos
are re-written, meaning that they can be encrypted. This commit is mostly just for the backend. We also need a fair few checks/restrictions in the UI: - any present atmos content dictates the project frame rate - no mixed edit rates of atmos content - probably some other things I haven't thought of
Diffstat (limited to 'src/lib/dcp_content.cc')
-rw-r--r--src/lib/dcp_content.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index ca210b558..d2c1df748 100644
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -18,6 +18,7 @@
*/
+#include "atmos_content.h"
#include "dcp_content.h"
#include "video_content.h"
#include "audio_content.h"
@@ -233,6 +234,11 @@ DCPContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
as->set_mapping (m);
}
+ if (examiner->has_atmos()) {
+ boost::mutex::scoped_lock lm (_mutex);
+ atmos.reset (new AtmosContent(this));
+ }
+
int texts = 0;
{
boost::mutex::scoped_lock lm (_mutex);