projects
/
wdq2wav.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r4116: Automatic commit for debian_version_0_5_1-1
[wdq2wav.git]
/
wdq2wav.cpp
diff --git
a/wdq2wav.cpp
b/wdq2wav.cpp
index cd3af8b168f9b306059ae15108752cf8430fc95c..60e58421c9a60554674abc11df48f2987b98d085 100644
(file)
--- a/
wdq2wav.cpp
+++ b/
wdq2wav.cpp
@@
-8,7
+8,7
@@
**
** Copyright (c) 2003 Kevin Rosenberg
**
**
** Copyright (c) 2003 Kevin Rosenberg
**
-** $Id: wdq2wav.cpp,v 1.1
8 2003/02/24 12:41:23
kevin Exp $
+** $Id: wdq2wav.cpp,v 1.1
9 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
**
** 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>
#include <wdq2wav.h>
-const char* g_szIdStr = "$Id: wdq2wav.cpp,v 1.1
8 2003/02/24 12:41:23
kevin Exp $";
+const char* g_szIdStr = "$Id: wdq2wav.cpp,v 1.1
9 2003/02/24 12:53:46
kevin Exp $";
bool g_quiet = false;
bool g_verbose = false;
bool g_quiet = false;
bool g_verbose = false;
@@
-291,7
+291,7
@@
wdq2wav (const char* wdq_fname, const int channel, const char *wav_fname, bool p
WindaqFile::WindaqFile (const char* fname)
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)
{
}
m_strFile (fname)
{
}
@@
-437,9
+437,6
@@
bool get_float8 (int fd, double& f)
bool
WindaqChannel::read_channel_data ()
{
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];
int fd = r_wdq.m_fd;
m_data = new signed short int [r_wdq.m_nSamples * 2];
@@
-468,7
+465,7
@@
WindaqChannel::read_channel_data ()
lseek (fd, r_wdq.m_nHeader_bytes, SEEK_SET);
unsigned long int i;
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;
for (i = 0; i < r_wdq.m_nSamples; i++) {
if (read (fd, sample_row, row_bytes) != row_bytes) {
std::ostringstream os;
@@
-644,9
+641,6
@@
WavFile::fill_header ()
bool
WavFile::WriteFile ()
{
bool
WavFile::WriteFile ()
{
- unsigned short int tmp2;
- unsigned int tmp4;
-
if (! m_valid)
return false;
if (! m_valid)
return false;
@@
-712,7
+706,7
@@
WavFile::Play ()
close(fd); 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;
if (ioctl (fd, SNDCTL_DSP_SPEED, &speed) == -1) {
error_msg ("Error setting sample rate");
close(fd); return false;