o removed waywars #endif

[asdcplib.git] / src / Wav.h

diff --git a/src/Wav.h b/src/Wav.h
index d2a97895e7380885450a0cb856d819173ae215d6..7e274d8787561f16d588b65f9801e6c0e744d4f7 100755 (executable)
--- a/src/Wav.h
+++ b/src/Wav.h
@@ -89,8 +89,8 @@ 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;
+      const ui16_t ASDCP_WAVE_FORMAT_PCM = 1;
+      const ui16_t ASDCP_WAVE_FORMAT_EXTENSIBLE = 65534;
 
       //
       class SimpleWaveHeader
@@ -127,7 +127,7 @@ namespace ASDCP
 
       static const ui32_t MAX_RIFF_LEN = 0xFFFFFFFF;
       static const ui32_t DS64_HEADER_LEN = 28;
-      static const ui32_t SIMPLE_RF64_HEADER_LEN = 80;
+      static const ui32_t SIMPLE_RF64_HEADER_LEN = 82;
       //
       class SimpleRF64Header
        {
@@ -138,11 +138,12 @@ namespace ASDCP
          ui32_t        avgbps;
          ui16_t        blockalign;
          ui16_t        bitspersample;
+         ui16_t        cbsize;
          ui64_t        data_len;
 
          SimpleRF64Header() :
            format(0), nchannels(0), samplespersec(0), avgbps(0),
-           blockalign(0), bitspersample(0), data_len(0) {}
+           blockalign(0), bitspersample(0), cbsize(0), data_len(0) {}
 
          SimpleRF64Header(ASDCP::PCM::AudioDescriptor& ADesc);