Fix missing const.

[libdcp.git] / src / mxf.cc

diff --git a/src/mxf.cc b/src/mxf.cc
index f902212ee4a1e10cc5b8bb833b38182d7420a099..512da8441a77afcfe14779c92f2ec48b783bb628 100644 (file)
--- a/src/mxf.cc
+++ b/src/mxf.cc
@@ -16,6 +16,19 @@
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
 
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 /** @file  src/asset.cc
@@ -23,15 +36,15 @@
  */
 
 #include "raw_convert.h"
-#include "AS_DCP.h"
-#include "KM_prng.h"
-#include "KM_util.h"
 #include "mxf.h"
 #include "util.h"
 #include "metadata.h"
 #include "exceptions.h"
 #include "dcp_assert.h"
 #include "compose.hpp"
+#include <asdcp/AS_DCP.h>
+#include <asdcp/KM_prng.h>
+#include <asdcp/KM_util.h>
 #include <libxml++/nodes/element.h>
 #include <boost/filesystem.hpp>
 #include <iostream>
@@ -45,24 +58,29 @@ using boost::dynamic_pointer_cast;
 using namespace dcp;
 
 MXF::MXF ()
-       : _decryption_context (0)
+       : _context_id (make_uuid ())
 {
-
+       /* Subclasses can create MXFs with unspecified _standard but are expected to fill
+          _standard in once the MXF is read.
+       */
 }
 
-MXF::~MXF ()
+MXF::MXF (Standard standard)
+       : _context_id (make_uuid ())
+       , _standard (standard)
 {
-       delete _decryption_context;
+
 }
 
 void
-MXF::fill_writer_info (ASDCP::WriterInfo* writer_info, string id, Standard standard) const
+MXF::fill_writer_info (ASDCP::WriterInfo* writer_info, string id) const
 {
        writer_info->ProductVersion = _metadata.product_version;
        writer_info->CompanyName = _metadata.company_name;
-       writer_info->ProductName = _metadata.product_name.c_str();
+       writer_info->ProductName = _metadata.product_name;
 
-       if (standard == INTEROP) {
+       DCP_ASSERT (_standard);
+       if (_standard == INTEROP) {
                writer_info->LabelSetType = ASDCP::LS_MXF_INTEROP;
        } else {
                writer_info->LabelSetType = ASDCP::LS_MXF_SMPTE;
@@ -74,7 +92,7 @@ MXF::fill_writer_info (ASDCP::WriterInfo* writer_info, string id, Standard stand
        writer_info->UsesHMAC = true;
 
        if (_key_id) {
-               Kumu::GenRandomUUID (writer_info->ContextID);
+               Kumu::hex2bin (_context_id.c_str(), writer_info->ContextID, Kumu::UUID_Length, &c);
                writer_info->EncryptedEssence = true;
 
                unsigned int c;
@@ -97,11 +115,6 @@ MXF::set_key (Key key)
                /* No key ID so far; we now need one */
                _key_id = make_uuid ();
        }
-
-       _decryption_context = new ASDCP::AESDecContext;
-       if (ASDCP_FAILURE (_decryption_context->InitKey (_key->value ()))) {
-               throw MiscError ("could not set up decryption context");
-       }
 }
 
 string
@@ -114,6 +127,17 @@ MXF::read_writer_info (ASDCP::WriterInfo const & info)
                _key_id = buffer;
        }
 
+       switch (info.LabelSetType) {
+       case ASDCP::LS_MXF_INTEROP:
+               _standard = INTEROP;
+               break;
+       case ASDCP::LS_MXF_SMPTE:
+               _standard = SMPTE;
+               break;
+       default:
+               throw ReadError ("Unrecognised label set type in MXF");
+       }
+
        _metadata.read (info);
 
        Kumu::bin2UUIDhex (info.AssetUUID, ASDCP::UUIDlen, buffer, sizeof (buffer));