Merge pull request #20 from cinecert/htj2c

[asdcplib.git] / src / AS_DCP_DCData_internal.h

diff --git a/src/AS_DCP_DCData_internal.h b/src/AS_DCP_DCData_internal.h
index 65d6c41f285b5f58f564b1161cf3f6d7ceb86606..a9e510d4839a3547cb5f4213d14e6a6482b17117 100644 (file)
--- a/src/AS_DCP_DCData_internal.h
+++ b/src/AS_DCP_DCData_internal.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2004-2012, John Hurst
+Copyright (c) 2004-2013, John Hurst
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -60,12 +60,12 @@ namespace DCData
     h__Reader(const Dictionary& d) : ASDCP::h__ASDCPReader(d), m_EssenceDescriptor(0),
                                      m_DDesc() {}
     ~h__Reader() {}
-    Result_t    OpenRead(const char*);
+    Result_t    OpenRead(const std::string&);
     Result_t    ReadFrame(ui32_t, FrameBuffer&, AESDecContext*, HMACContext*);
     Result_t    MD_to_DCData_DDesc(DCData::DCDataDescriptor& DDesc);
   };
 
-  class h__Writer : public ASDCP::h__Writer
+  class h__Writer : public ASDCP::h__ASDCPWriter
   {
     ASDCP_NO_COPY_CONSTRUCT(h__Writer);
     h__Writer();
@@ -74,13 +74,13 @@ namespace DCData
     DCDataDescriptor m_DDesc;
     byte_t           m_EssenceUL[SMPTE_UL_LENGTH];
 
-    h__Writer(const Dictionary& d) : ASDCP::h__Writer(d) {
+    h__Writer(const Dictionary& d) : ASDCP::h__ASDCPWriter(d) {
       memset(m_EssenceUL, 0, SMPTE_UL_LENGTH);
     }
 
     ~h__Writer(){}
 
-    Result_t OpenWrite(const char*, ui32_t HeaderSize, const SubDescriptorList_t& subDescriptors);
+    Result_t OpenWrite(const std::string&, ui32_t HeaderSize, const SubDescriptorList_t& subDescriptors);
     Result_t SetSourceStream(const DCDataDescriptor&, const byte_t*, const std::string&, const std::string&);
     Result_t WriteFrame(const FrameBuffer&, AESEncContext* = 0, HMACContext* = 0);
     Result_t Finalize();