Make Atmos content work more like other content. Now its MXFsv2.15.82

are re-written, meaning that they can be encrypted.

This (along with the libdcp update) also fixes assorted Atmos bugs.

1 files changed, 46 insertions, 0 deletions

diff --git a/src/lib/content_atmos.h b/src/lib/content_atmos.h
new file mode 100644
index 000000000..57b7e404f
--- /dev/null
+++ b/src/lib/content_atmos.h
@@ -0,0 +1,46 @@
+/*
+    Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef DCPOMATIC_CONTENT_ATMOS_H
+#define DCPOMATIC_CONTENT_ATMOS_H
+
+#include "atmos_metadata.h"
+#include "types.h"
+#include <dcp/atmos_asset_reader.h>
+#include <boost/shared_ptr.hpp>
+
+/** @class ContentAtmos
+ *  @brief Some Atmos data that has come out of a decoder.
+ */
+class ContentAtmos
+{
+public:
+	ContentAtmos (boost::shared_ptr<const dcp::AtmosFrame> data_, Frame frame_, AtmosMetadata metadata_)
+		: data (data_)
+		, frame (frame_)
+		, metadata (metadata_)
+	{}
+
+	boost::shared_ptr<const dcp::AtmosFrame> data;
+	Frame frame;
+	AtmosMetadata metadata;
+};
+
+#endif