Added atmos support and new ULs per SMPTE 429-2:2013 - see README for deets.

1 files changed, 30 insertions, 16 deletions

diff --git a/src/WavFileWriter.h b/src/WavFileWriter.h
index 3febc23..9611adc 100755
--- a/src/WavFileWriter.h
+++ b/src/WavFileWriter.h
@@ -136,22 +136,36 @@ class WavFileWriter
       assert(file_count && m_ChannelCount);
 
       ui32_t element_size = ASDCP::PCM::CalcFrameBufferSize(m_ADesc) / file_count;
-
-      for ( ui32_t i = 0; i < file_count && ASDCP_SUCCESS(result); i++ )
-	{
-	  snprintf(filename, Kumu::MaxFilePath, "%s_%u.wav", file_root, (i + 1));
-	  m_OutFile.push_back(new WavFileElement(element_size));
-	  result = m_OutFile.back()->OpenWrite(filename);
-
-	  if ( ASDCP_SUCCESS(result) )
-	    {
-	      ASDCP::PCM::AudioDescriptor tmpDesc = m_ADesc;
-	      tmpDesc.ChannelCount = m_ChannelCount;
-	      ASDCP::Wav::SimpleWaveHeader Wav(tmpDesc);
-	      result = Wav.WriteToFile(*(m_OutFile.back()));
-	    }
-	}
-      
+      if (split == ST_NONE)
+      {
+          snprintf(filename, Kumu::MaxFilePath, "%s", file_root);
+          m_OutFile.push_back(new WavFileElement(element_size));
+          result = m_OutFile.back()->OpenWrite(filename);
+          if ( ASDCP_SUCCESS(result) )
+          {
+              ASDCP::PCM::AudioDescriptor tmpDesc = m_ADesc;
+              tmpDesc.ChannelCount = m_ChannelCount;
+              ASDCP::RF64::SimpleRF64Header Wav(tmpDesc);
+              result = Wav.WriteToFile(*(m_OutFile.back()));
+          }
+      }
+      else
+      {
+          for ( ui32_t i = 0; i < file_count && ASDCP_SUCCESS(result); i++ )
+          {
+              snprintf(filename, Kumu::MaxFilePath, "%s_%u.wav", file_root, (i + 1));
+              m_OutFile.push_back(new WavFileElement(element_size));
+              result = m_OutFile.back()->OpenWrite(filename);
+
+              if ( ASDCP_SUCCESS(result) )
+              {
+                  ASDCP::PCM::AudioDescriptor tmpDesc = m_ADesc;
+                  tmpDesc.ChannelCount = m_ChannelCount;
+                  ASDCP::RF64::SimpleRF64Header Wav(tmpDesc);
+                  result = Wav.WriteToFile(*(m_OutFile.back()));
+              }
+          }
+      }
       return result;
     }