Merge master; MXF subtitle stuff not included.

[libdcp.git] / asdcplib / src / AS_DCP_internal.h

diff --git a/asdcplib/src/AS_DCP_internal.h b/asdcplib/src/AS_DCP_internal.h
index 811a87c231f1ed99e16e99efc99361cf30fd9ac1..73106a2688cadb5cceaf015f0cdf924e3150bea3 100755 (executable)
--- a/asdcplib/src/AS_DCP_internal.h
+++ b/asdcplib/src/AS_DCP_internal.h
@@ -110,9 +110,9 @@ namespace ASDCP
       KLReader() {}
       ~KLReader() {}
 
-      inline const byte_t* Key() { return m_KeyBuf; }
-      inline const ui64_t  Length() { return m_ValueLength; }
-      inline const ui64_t  KLLength() { return m_KLLength; }
+      inline byte_t* Key() { return m_KeyBuf; }
+      inline ui64_t  Length() { return m_ValueLength; }
+      inline ui64_t  KLLength() { return m_KLLength; }
       
       Result_t ReadKLFromFile(Kumu::FileReader& Reader);
     };
@@ -237,8 +237,10 @@ namespace ASDCP
                              ui32_t TCFrameRate, ui32_t BytesPerEditUnit = 0);
 
       Result_t WriteEKLVPacket(const ASDCP::FrameBuffer& FrameBuf,
-                              const byte_t* EssenceUL, AESEncContext* Ctx, HMACContext* HMAC);
+                              const byte_t* EssenceUL, AESEncContext* Ctx, HMACContext* HMAC, std::string* hash = 0);
 
+      Result_t FakeWriteEKLVPacket(int size);
+           
       Result_t WriteMXFFooter();
 
    };