**
** Copyright (c) 2003 Kevin Rosenberg
**
-** $Id: wdq2wav.cpp,v 1.18 2003/02/24 12:41:23 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
#include <wdq2wav.h>
-const char* g_szIdStr = "$Id: wdq2wav.cpp,v 1.18 2003/02/24 12:41:23 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;
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)
{
}
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];
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;
bool
WavFile::WriteFile ()
{
- unsigned short int tmp2;
- unsigned int tmp4;
-
if (! m_valid)
return false;
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;
**
** Copyright (c) 2003 Kevin Rosenberg
**
-** $Id: wdq2wav.h,v 1.10 2003/02/12 07:24:32 kevin Exp $
+** $Id: wdq2wav.h,v 1.11 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
~WindaqFile ();
bool ReadHeader();
- std::string m_strFile;
bool m_valid;
std::string m_error;
int m_fd;
int m_nChannels;
- unsigned int m_nSamples;
+ 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;
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;