X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=wdq2wav.cpp;h=ff0430a21fdfa5e82f2d9794c7303210b9196104;hb=4a2c9e6fb315f56b08c27b05ba48f7dd73622f9d;hp=f9c5ef80dd80fe5ff5ca044ac38e85de0fea1091;hpb=074ede98db9c520d4437dd5efcf2a9f64e8efe84;p=wdq2wav.git

diff --git a/wdq2wav.cpp b/wdq2wav.cpp
index f9c5ef8..ff0430a 100644
--- a/wdq2wav.cpp
+++ b/wdq2wav.cpp
@@ -8,7 +8,7 @@
 **
 **  Copyright (c) 2003 Kevin Rosenberg
 **
-**  $Id: wdq2wav.cpp,v 1.11 2003/01/21 11:45:38 kevin Exp $
+**  $Id: wdq2wav.cpp,v 1.14 2003/01/21 19:52:20 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -26,7 +26,7 @@
 
 #include <wdq2wav.h>
 
-const char* g_szIdStr = "$Id: wdq2wav.cpp,v 1.11 2003/01/21 11:45:38 kevin Exp $";
+const char* g_szIdStr = "$Id: wdq2wav.cpp,v 1.14 2003/01/21 19:52:20 kevin Exp $";
 
 bool g_quiet = false;
 bool g_verbose = false;
@@ -168,14 +168,14 @@ main (int argc, char *argv[])
       std::cin.getline (wav_fname, MAX_INPUT_STR);
     }
       
-    if (! wdq2wav (wdq_fname, channel, wav_fname))
+    if (! wdq2wav (wdq_fname, channel, wav_fname, play))
       return 1;
     
     return 0;
 }
 
 bool
-wdq2wav (const char* wdq_fname, const int channel, const char *wav_fname)
+wdq2wav (const char* wdq_fname, const int channel, const char *wav_fname, bool play)
 {
   WindaqFile wdq (wdq_fname);
 
@@ -253,6 +253,9 @@ wdq2wav (const char* wdq_fname, const int channel, const char *wav_fname)
     return false;
   }
 
+  if (play)
+    wav.Play();
+  
   return true;
 }
 
@@ -495,10 +498,11 @@ WavFile::WavFile (WindaqChannel& wdq_channel, const char* fname)
       info_msg (os.str().c_str());
     }
     
-    unsigned int nHeaderBytes = 44;
-    m_nFileBytes = nHeaderBytes + m_nSamples * m_nBytesPerSample;
+    m_nHeaderBytes = 44;
+    m_nDataBytes = m_nSamples * m_nBytesPerSample * m_nChannels;
+    m_nFileBytes = m_nHeaderBytes + m_nDataBytes;
 
-    unsigned int nHeaderShortInts = nHeaderBytes / sizeof(signed short int);
+    unsigned int nHeaderShortInts = m_nHeaderBytes / sizeof(signed short int);
 
     m_data = new signed short int [m_nSamples + nHeaderShortInts];
     signed short int* input = wdq_channel.m_data;
@@ -557,12 +561,11 @@ bool
 WavFile::fill_header ()
 {
   char* pData = reinterpret_cast<char*> (m_data);
-  unsigned long data_bytes = m_nSamples * m_nBytesPerSample * m_nChannels;
 
   strncpy (pData, "RIFF", 4);
 
   // Length of file after 8 byte header
-  put_int4 (pData + 4, 36 + data_bytes);
+  put_int4 (pData + 4, 36 + m_nDataBytes);
 
   strncpy (pData + 8, "WAVEfmt ", 8);
 
@@ -589,7 +592,7 @@ WavFile::fill_header ()
 
   strncpy (pData + 36, "data", 4);
 
-  put_int4 (pData + 40, data_bytes);
+  put_int4 (pData + 40, m_nDataBytes);
 
   return true;
 }
@@ -625,6 +628,70 @@ WavFile::WriteFile ()
   return true;
 }
 
+#ifdef WIN32
+#include <windows.h>
+#include <mmsystem.h>
+#elif defined(LINUX)
+#include <sys/ioctl.h>
+#include <sys/soundcard.h>
+#endif
 
+bool
+WavFile::Play ()
+{
+#ifdef WIN32
+  if (PlaySound ((LPCSTR) m_data, 0, SND_MEMORY | SND_NODEFAULT))
+    return true;
+#elif defined(LINUX)
+  int fd;
+  if ((fd = open ("/dev/dsp",O_WRONLY)) == -1) {
+    error_msg ("Error opening /dev/dsp");
+    return false;
+  }
   
+  int format = AFMT_S16_LE;
+  if (ioctl (fd, SNDCTL_DSP_SETFMT, &format) == -1) {
+    error_msg ("Error setting DSP format");
+    close(fd); return false;
+  }
+  if (format != AFMT_S16_LE) {
+    error_msg ("DSP Format not set");
+    close(fd); return false;
+  }
+  
+  int channels = m_nChannels;
+  if (ioctl (fd, SNDCTL_DSP_CHANNELS, &format) == -1) {
+    error_msg ("Error setting number of channels");
+    close(fd); return false;
+  }
+  if (channels != m_nChannels) {
+    error_msg ("Number of channels not set");
+    close(fd); return false;
+  }
+
+  int speed = static_cast<int>(m_rate + 0.5);
+  if (ioctl (fd, SNDCTL_DSP_SPEED, &speed) == -1) {
+    error_msg ("Error setting sample rate");
+    close(fd); return false;
+  }
+  if (speed != m_rate && ! g_quiet) {
+    std::ostringstream os;
+    os << "Warning: Sample rate set to " << speed << ", not " << m_rate;
+    error_msg (os.str().c_str());
+  }
+    
+  if (write (fd, reinterpret_cast<char*>(m_data) + m_nHeaderBytes, m_nDataBytes) !=
+      m_nDataBytes) {
+    error_msg ("Error writing audio samples");
+    close(fd); return false;
+  }
+
+  close (fd);
+  return true;
+#else
+#endif
+  
+  return false;
+}
+