projects
/
wdq2wav.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update operating system detection for condition compilation.
[wdq2wav.git]
/
wdq2wav.h
diff --git
a/wdq2wav.h
b/wdq2wav.h
index 6cff82bace00595a989cb9cdccbff9cbd2f11773..a5e5ad2d2c33d00e6751dc90bc635666737aa8dd 100644
(file)
--- a/
wdq2wav.h
+++ b/
wdq2wav.h
@@
-35,14
+35,14
@@
#include <math.h>
#include <sys/types.h>
#include <sys/stat.h>
#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
#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
#include <endian.h>
#if __BYTE_ORDER == __BIG_ENDIAN
#define WORDS_BIG_ENDIAN 1
@@
-72,6
+72,9
@@
public:
bool m_valid;
std::string m_error;
int m_fd;
bool m_valid;
std::string m_error;
int m_fd;
+ bool m_bLegacy_format;
+ bool m_bHires;
+ int m_nMaxChannels;
int m_nChannels;
unsigned long int m_nSamples;
double m_sample_rate;
int m_nChannels;
unsigned long int m_nSamples;
double m_sample_rate;
@@
-81,9
+84,13
@@
public:
unsigned int m_nData_bytes;
unsigned int m_time_acq_start;
unsigned int m_time_acq_stop;
unsigned int m_nData_bytes;
unsigned int m_time_acq_start;
unsigned int m_time_acq_stop;
+ double m_time_between_channel_samples;
+
+ bool any_packed_channels();
+ bool is_channel_packed(int iChannel);
};
};
-class WindaqChannel
+class WindaqChannel
{
public:
WindaqFile& r_wdq;
{
public:
WindaqFile& r_wdq;
@@
-106,7
+113,7
@@
public:
};
};
-class WavFile
+class WavFile
{
public:
bool m_valid;
{
public:
bool m_valid;
@@
-128,7
+135,7
@@
class WavFile
bool WriteFile ();
bool Play();
bool WriteFile ();
bool Play();
-
+
private:
bool fill_header();
};
private:
bool fill_header();
};
@@
-137,5
+144,5
@@
template<class T>
inline T nearest (double x)
{
return (x > 0 ?
inline T nearest (double x)
{
return (x > 0 ?
- static_cast<T>(x+0.5) : static_cast<T>(x-0.5));
+
static_cast<T>(x+0.5) : static_cast<T>(x-0.5));
}
}