X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=wdq2wav.h;h=6cff82bace00595a989cb9cdccbff9cbd2f11773;hb=8ddc5f8ddd4b1f33f797b767cacf8d26e4392e6b;hp=e92e1ac6ed12eee201ff32aae34b513322f5ef2e;hpb=b12a849bcbdfc2fdcd6026cab709236587769f42;p=wdq2wav.git

diff --git a/wdq2wav.h b/wdq2wav.h
index e92e1ac..6cff82b 100644
--- a/wdq2wav.h
+++ b/wdq2wav.h
@@ -8,7 +8,7 @@
 **
 **  Copyright (c) 2003 Kevin Rosenberg
 **
-**  $Id: wdq2wav.h,v 1.8 2003/01/21 12:59:56 kevin Exp $
+**  $Id$
 **
 **  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
@@ -24,6 +24,7 @@
 **  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ******************************************************************************/
 
+#include <stdio.h>
 #include <iostream>
 #include <cstdio>
 #include <cstring>
@@ -31,9 +32,22 @@
 #include <sstream>
 #include <ctime>
 #include <fcntl.h>
-#include <unistd.h>
+#include <math.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#ifdef WIN32
+#include <io.h>
+#include <getopt.h>
+#else
+#include <unistd.h>
+#endif
+
+#ifdef LINUX
+#include <endian.h>
+#if __BYTE_ORDER == __BIG_ENDIAN
+#define WORDS_BIG_ENDIAN 1
+#endif
+#endif
 
 extern const char* g_szIdStr;
 extern bool g_quiet;
@@ -55,13 +69,13 @@ public:
   ~WindaqFile ();
   bool ReadHeader();
 
-  std::string m_strFile;
   bool m_valid;
   std::string m_error;
   int m_fd;
-  unsigned int m_nChannels;
-  unsigned int m_nSamples;
+  int m_nChannels;
+  unsigned long int m_nSamples;
   double m_sample_rate;
+  std::string m_strFile;
   unsigned int m_sr_denom, m_sr_numer;
   unsigned short int m_nHeader_bytes, m_channel_offset, m_nBytes_channel_header;
   unsigned int m_nData_bytes;
@@ -72,13 +86,13 @@ public:
 class WindaqChannel 
 {
 public:
-  bool m_valid;
-  unsigned int m_channel;
-  std::string m_units;
+  WindaqFile& r_wdq;
+  signed short int *m_data;
   double m_slope;
   double m_intercept;
-  signed short int *m_data;
-  WindaqFile& r_wdq;
+  unsigned int m_channel;
+  bool m_valid;
+  std::string m_units;
   signed short int m_min_raw_data;
   signed short int m_max_raw_data;
   double m_max_scaled_data;
@@ -95,18 +109,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 ();
@@ -118,3 +132,10 @@ class WavFile
  private:
   bool fill_header();
 };
+
+template<class T>
+inline T nearest (double x)
+{
+  return (x > 0 ?
+	  static_cast<T>(x+0.5) : static_cast<T>(x-0.5));
+}