const, baby

[asdcplib.git] / src / Wav.h

diff --git a/src/Wav.h b/src/Wav.h
index efd99c05b2e45fc2ba07d2c54d7e15673380bb4d..ef9c4e20870786a6e508ae45012e2598356e00ce 100755 (executable)
--- a/src/Wav.h
+++ b/src/Wav.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2005, John Hurst
+Copyright (c) 2005-2009, John Hurst
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -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;
        };
 
@@ -88,6 +89,9 @@ namespace ASDCP
       const fourcc FCC_fmt_("fmt ");
       const fourcc FCC_data("data");
 
+      const ui16_t WAVE_FORMAT_PCM = 1;
+      const ui16_t WAVE_FORMAT_EXTENSIBLE = 65534;
+
       //
       class SimpleWaveHeader
        {
@@ -108,8 +112,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;
        };