Bump version

[libdcp.git] / src / mxf.cc

diff --git a/src/mxf.cc b/src/mxf.cc
index 80a351e60d19b72360fb8b40a3dec10d45b82908..1c493901e72c47102799c059a17a55dda38f047e 100644 (file)
--- a/src/mxf.cc
+++ b/src/mxf.cc
@@ -36,6 +36,7 @@
 #include <iostream>
 
 using std::string;
+using std::cout;
 using std::list;
 using std::pair;
 using boost::shared_ptr;
@@ -54,7 +55,7 @@ MXF::~MXF ()
 }
 
 void
-MXF::fill_writer_info (ASDCP::WriterInfo* writer_info, string id, Standard standard)
+MXF::fill_writer_info (ASDCP::WriterInfo* writer_info, string id, Standard standard) const
 {
        writer_info->ProductVersion = _metadata.product_version;
        writer_info->CompanyName = _metadata.company_name;
@@ -93,7 +94,7 @@ 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");
@@ -105,11 +106,13 @@ MXF::read_writer_info (ASDCP::WriterInfo const & info)
 {
        char buffer[64];
 
-       Kumu::bin2UUIDhex (info.CryptographicKeyID, ASDCP::UUIDlen, buffer, sizeof (buffer));
-       _key_id = buffer;
+       if (info.EncryptedEssence) {
+               Kumu::bin2UUIDhex (info.CryptographicKeyID, ASDCP::UUIDlen, buffer, sizeof (buffer));
+               _key_id = buffer;
+       }
 
        _metadata.read (info);
-       
+
        Kumu::bin2UUIDhex (info.AssetUUID, ASDCP::UUIDlen, buffer, sizeof (buffer));
        return buffer;
 }