From 65a8ec13b66c700b74788d3fc7525e91cf62bab0 Mon Sep 17 00:00:00 2001 From: jhurst Date: Mon, 18 May 2009 05:18:32 +0000 Subject: massive dictionary re-factoring --- src/AS_DCP_MXF.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/AS_DCP_MXF.cpp') diff --git a/src/AS_DCP_MXF.cpp b/src/AS_DCP_MXF.cpp index 98f92d1..1e0e2f8 100755 --- a/src/AS_DCP_MXF.cpp +++ b/src/AS_DCP_MXF.cpp @@ -132,7 +132,7 @@ ASDCP::MD_to_WriterInfo(Identification* InfoObj, WriterInfo& Info) // Result_t -ASDCP::MD_to_CryptoInfo(CryptographicContext* InfoObj, WriterInfo& Info) +ASDCP::MD_to_CryptoInfo(CryptographicContext* InfoObj, WriterInfo& Info, const Dictionary& Dict) { ASDCP_TEST_NULL(InfoObj); @@ -140,8 +140,8 @@ ASDCP::MD_to_CryptoInfo(CryptographicContext* InfoObj, WriterInfo& Info) memcpy(Info.ContextID, InfoObj->ContextID.Value(), UUIDlen); memcpy(Info.CryptographicKeyID, InfoObj->CryptographicKeyID.Value(), UUIDlen); - UL MIC_SHA1(Dict::ul(MDD_MICAlgorithm_HMAC_SHA1)); - UL MIC_NONE(Dict::ul(MDD_MICAlgorithm_NONE)); + UL MIC_SHA1(Dict.ul(MDD_MICAlgorithm_HMAC_SHA1)); + UL MIC_NONE(Dict.ul(MDD_MICAlgorithm_NONE)); if ( InfoObj->MICAlgorithm == MIC_SHA1 ) Info.UsesHMAC = true; @@ -163,9 +163,12 @@ ASDCP::MD_to_CryptoInfo(CryptographicContext* InfoObj, WriterInfo& Info) ASDCP::Result_t ASDCP::EssenceType(const char* filename, EssenceType_t& type) { + // TODO + Dictionary m_Dict; + ASDCP_TEST_NULL_STR(filename); Kumu::FileReader Reader; - OPAtomHeader TestHeader; + OPAtomHeader TestHeader(m_Dict); Result_t result = Reader.OpenRead(filename); -- cgit v1.2.3