r4116: Automatic commit for debian_version_0_5_1-1

[wdq2wav.git] / wdq2wav.cpp

diff --git a/wdq2wav.cpp b/wdq2wav.cpp
index 16eddba4560d82de001f304ad988e9db325e0e7a..60e58421c9a60554674abc11df48f2987b98d085 100644 (file)
--- a/wdq2wav.cpp
+++ b/wdq2wav.cpp
@@ -8,7 +8,7 @@
 **
 **  Copyright (c) 2003 Kevin Rosenberg
 **
-**  $Id: wdq2wav.cpp,v 1.17 2003/02/24 08:40:25 kevin Exp $
+**  $Id: wdq2wav.cpp,v 1.19 2003/02/24 12:53:46 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.17 2003/02/24 08:40:25 kevin Exp $";
+const char* g_szIdStr = "$Id: wdq2wav.cpp,v 1.19 2003/02/24 12:53:46 kevin Exp $";
 
 bool g_quiet = false;
 bool g_verbose = false;
@@ -126,7 +126,7 @@ main (int argc, char *argv[])
 
   const char* progname = argv[0];
   
-  while ((c = getopt (argc, argv, "rqvdph")) != -1) {
+  while ((c = getopt (argc, argv, "rqvzdph")) != -1) {
     switch (c) {
     case 'r':
         std::cout << "Version " << g_szIdStr << std::endl;
@@ -143,6 +143,9 @@ main (int argc, char *argv[])
     case 'p':
       play = true;
       break;
+    case 'z':
+      g_ignore_zero = true;
+      break;
     case 'h':
       usage (progname);
       return (0);
@@ -288,7 +291,7 @@ wdq2wav (const char* wdq_fname, const int channel, const char *wav_fname, bool p
 
 
 WindaqFile::WindaqFile (const char* fname)
-  : m_fd(0), m_nChannels(0), m_nSamples(0), m_sample_rate(0), m_valid(false),
+  : m_valid(false), m_fd(0), m_nChannels(0), m_nSamples(0), m_sample_rate(0),
     m_strFile (fname)
 {
 }
@@ -434,9 +437,6 @@ bool get_float8 (int fd, double& f)
 bool
 WindaqChannel::read_channel_data ()
 {
-  unsigned short int tmp2;
-  unsigned int tmp4;
-  
   int fd = r_wdq.m_fd;
 
   m_data = new signed short int [r_wdq.m_nSamples * 2];
@@ -465,7 +465,7 @@ WindaqChannel::read_channel_data ()
 
   lseek (fd, r_wdq.m_nHeader_bytes, SEEK_SET);
   unsigned long int i;
-  signed short int data_max, data_min;
+  signed short int data_max = 0, data_min = 0;
   for (i = 0; i < r_wdq.m_nSamples; i++) {
     if (read (fd, sample_row, row_bytes) != row_bytes) {
       std::ostringstream os;
@@ -523,9 +523,10 @@ WavFile::WavFile (WindaqChannel& wdq_channel, const char* fname)
                               wdq_channel.m_min_scaled_data);
     } else {
       double max_value = fabs(wdq_channel.m_max_scaled_data);
-      if (fabs(wdq_channel.m_min_scaled_data) > max_value)
-       max_value = fabs(wdq_channel.m_min_scaled_data);
-      data_scale = 32767. / max_value;
+      if (fabs (wdq_channel.m_min_scaled_data) > max_value)
+       max_value = fabs (wdq_channel.m_min_scaled_data);
+      if (max_value != 0.)
+       data_scale = 32767. / max_value;
     }
     
     if (g_debug) {
@@ -553,9 +554,12 @@ WavFile::WavFile (WindaqChannel& wdq_channel, const char* fname)
     for (i = 0; i < m_nSamples; i++) {
       double value = input[i];
       value = (slope * value) + intercept;
-      value = (value + data_offset) * data_scale;
-      if (g_ignore_zero)
+      if (g_ignore_zero) {
+       value = (value + data_offset) * data_scale;
        value += 0.5 - 32768;
+      } else
+       value = value * data_scale;
+      
       signed short int v = static_cast<signed short int>(value);
 #if WORDS_BIG_ENDIAN
       unsigned char* p = reinterpret_cast<unsigned char*>(&v);
@@ -637,9 +641,6 @@ WavFile::fill_header ()
 bool
 WavFile::WriteFile ()
 {
-  unsigned short int tmp2;
-  unsigned int tmp4;
-
   if (! m_valid)
     return false;
 
@@ -705,7 +706,7 @@ WavFile::Play ()
     close(fd); return false;
   }
 
-  int speed = static_cast<int>(m_rate + 0.5);
+  unsigned 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;