**
** Copyright (c) 2003 Kevin Rosenberg
**
-** $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
** published by the Free Software Foundation.
if (m_bLegacy_format)
m_sample_rate = (double) m_sr_numer / (double) (m_sr_denom * m_nChannels);
else
- m_sample_rate = (double) m_nChannels / m_time_between_channel_samples;
+ m_sample_rate = (double) 1 / m_time_between_channel_samples;
lseek (m_fd, 36, SEEK_SET);
if (! read_int4 (m_fd, m_time_acq_start))
return true;
}
-#ifdef WIN32
+#ifdef _WIN32
#include <windows.h>
#include <mmsystem.h>
-#elif defined(LINUX)
+#elif defined(__linux__)
#include <sys/ioctl.h>
#include <sys/soundcard.h>
#endif
bool
WavFile::Play ()
{
-#ifdef WIN32
+#ifdef _WIN32
if (PlaySound ((LPCSTR) m_data, 0, SND_MEMORY | SND_NODEFAULT))
return true;
-#elif defined(LINUX)
+#elif defined(__linux__)
int fd;
if ((fd = open ("/dev/dsp",O_WRONLY)) == -1) {
error_msg ("Error opening /dev/dsp");