ginormo merge-back with Kumu, SMPTE MIC key and MPEG parser fix

[asdcplib.git] / src / Wav.h

diff --git a/src/Wav.h b/src/Wav.h
index efd99c05b2e45fc2ba07d2c54d7e15673380bb4d..bd890ce5022eb692c6724e264e008c38a2cad6d6 100755 (executable)
--- a/src/Wav.h
+++ b/src/Wav.h
@@ -32,7 +32,8 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef _WAV_H_
 #define _WAV_H_
 
-#include <FileIO.h>
+#include <KM_fileio.h>
+#include <AS_DCP.h>
 
 namespace ASDCP
 {
@@ -73,7 +74,7 @@ namespace ASDCP
          }
          
          Result_t  ReadFromBuffer(const byte_t* buf, ui32_t buf_len, ui32_t* data_start);
-         Result_t  ReadFromFile(const ASDCP::FileReader& InFile, ui32_t* data_start);
+         Result_t  ReadFromFile(const Kumu::FileReader& InFile, ui32_t* data_start);
          void      FillADesc(ASDCP::PCM::AudioDescriptor& ADesc, Rational PictureRate) const;
        };
 
@@ -108,8 +109,8 @@ namespace ASDCP
          SimpleWaveHeader(ASDCP::PCM::AudioDescriptor& ADesc);
          
          Result_t  ReadFromBuffer(const byte_t* buf, ui32_t buf_len, ui32_t* data_start);
-         Result_t  ReadFromFile(const ASDCP::FileReader& InFile, ui32_t* data_start);
-         Result_t  WriteToFile(ASDCP::FileWriter& OutFile) const;
+         Result_t  ReadFromFile(const Kumu::FileReader& InFile, ui32_t* data_start);
+         Result_t  WriteToFile(Kumu::FileWriter& OutFile) const;
          void      FillADesc(ASDCP::PCM::AudioDescriptor& ADesc, Rational PictureRate) const;
        };