From dc90079411b1857c8e47512ad6edd8af264daffa Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Mon, 24 Feb 2003 13:01:02 +0000
Subject: [PATCH] r4117: *** empty log message ***

---
 wdq2wav.cpp |  8 ++++----
 wdq2wav.h   | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/wdq2wav.cpp b/wdq2wav.cpp
index 60e5842..a3320b2 100644
--- a/wdq2wav.cpp
+++ b/wdq2wav.cpp
@@ -8,7 +8,7 @@
 **
 **  Copyright (c) 2003 Kevin Rosenberg
 **
-**  $Id: wdq2wav.cpp,v 1.19 2003/02/24 12:53:46 kevin Exp $
+**  $Id: wdq2wav.cpp,v 1.20 2003/02/24 13:01:02 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.19 2003/02/24 12:53:46 kevin Exp $";
+const char* g_szIdStr = "$Id: wdq2wav.cpp,v 1.20 2003/02/24 13:01:02 kevin Exp $";
 
 bool g_quiet = false;
 bool g_verbose = false;
@@ -458,7 +458,7 @@ WindaqChannel::read_channel_data ()
   }
   m_units = units;
  
-  unsigned int row_bytes = 2 * r_wdq.m_nChannels;
+  long int row_bytes = 2 * r_wdq.m_nChannels;
   signed short int *sample_row = new signed short int [row_bytes];
   
   signed short int* psample = &sample_row[m_channel - 1];
@@ -696,7 +696,7 @@ WavFile::Play ()
     close(fd); return false;
   }
   
-  int channels = m_nChannels;
+  unsigned int channels = m_nChannels;
   if (ioctl (fd, SNDCTL_DSP_CHANNELS, &format) == -1) {
     error_msg ("Error setting number of channels");
     close(fd); return false;
diff --git a/wdq2wav.h b/wdq2wav.h
index 4ebee21..10697d3 100644
--- a/wdq2wav.h
+++ b/wdq2wav.h
@@ -8,7 +8,7 @@
 **
 **  Copyright (c) 2003 Kevin Rosenberg
 **
-**  $Id: wdq2wav.h,v 1.11 2003/02/24 12:53:46 kevin Exp $
+**  $Id: wdq2wav.h,v 1.12 2003/02/24 13:01:02 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
@@ -108,18 +108,18 @@ public:
 class WavFile 
 {
  public:
-  std::string m_strFile;
-  int m_fd;
   bool m_valid;
+  signed short int* m_data;
   unsigned long int m_nSamples;
+  std::string m_strFile;
+  int m_fd;
   double m_rate;
   unsigned int m_nChannels;
   unsigned int m_nBitsPerSample;
   unsigned int m_nBytesPerSample;
-  signed short int* m_data;
   unsigned long int m_nHeaderBytes;
-  unsigned long int m_nDataBytes;
-  unsigned long int m_nFileBytes;
+  long int m_nDataBytes;
+  long int m_nFileBytes;
 
   WavFile (WindaqChannel& wdq_channel, const char* fname);
   ~WavFile ();
-- 
2.34.1