X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=wdq2wav.h;h=fceee293df2b9819095020e7dad1be57d33971c5;hb=151ee940c8cd670deedbe4ddfee0887a7b726f43;hp=6e740f4e772d7a8b5f7db22b0865764a0bf27b7b;hpb=6e0f65ebf4769e7f90e2ef29539cd493de9bf14b;p=wdq2wav.git

diff --git a/wdq2wav.h b/wdq2wav.h
index 6e740f4..fceee29 100644
--- a/wdq2wav.h
+++ b/wdq2wav.h
@@ -35,14 +35,14 @@
 #include <math.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifdef WIN32
+#ifdef _WIN32
 #include <io.h>
 #include <getopt.h>
 #else
 #include <unistd.h>
 #endif
 
-#ifdef LINUX
+#ifdef __linux__
 #include <endian.h>
 #if __BYTE_ORDER == __BIG_ENDIAN
 #define WORDS_BIG_ENDIAN 1
@@ -104,9 +104,11 @@ public:
   signed short int m_max_raw_data;
   double m_max_scaled_data;
   double m_min_scaled_data;
+  double m_raw_mean;
 
   WindaqChannel (WindaqFile& wdq, const int channel);
   ~WindaqChannel ();
+  double raw2measured(signed short int raw) const { return (raw * m_slope) + m_intercept; }
 
  private:
   bool read_channel_data();