X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=wdq2wav.cpp;h=ff0430a21fdfa5e82f2d9794c7303210b9196104;hb=4a2c9e6fb315f56b08c27b05ba48f7dd73622f9d;hp=e307f00c5f757e52e465d8958b2faa072609bf92;hpb=8eec8116b49d2838727bd77a75308c6a65aaf2e7;p=wdq2wav.git diff --git a/wdq2wav.cpp b/wdq2wav.cpp index e307f00..ff0430a 100644 --- a/wdq2wav.cpp +++ b/wdq2wav.cpp @@ -8,7 +8,7 @@ ** ** Copyright (c) 2003 Kevin Rosenberg ** -** $Id: wdq2wav.cpp,v 1.10 2003/01/21 11:23:09 kevin Exp $ +** $Id: wdq2wav.cpp,v 1.14 2003/01/21 19:52:20 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 @@ -26,7 +26,7 @@ #include -const char* g_szIdStr = "$Id: wdq2wav.cpp,v 1.10 2003/01/21 11:23:09 kevin Exp $"; +const char* g_szIdStr = "$Id: wdq2wav.cpp,v 1.14 2003/01/21 19:52:20 kevin Exp $"; bool g_quiet = false; bool g_verbose = false; @@ -98,6 +98,8 @@ main (int argc, char *argv[]) int c; bool play = false; + const char* progname = argv[0]; + while ((c = getopt (argc, argv, "rqvdph")) != -1) { switch (c) { case 'r': @@ -116,11 +118,11 @@ main (int argc, char *argv[]) play = true; break; case 'h': - usage (argv[0]); + usage (progname); return (0); case '?': default: - usage(argv[0]); + usage (progname); return (1); } } @@ -128,13 +130,13 @@ main (int argc, char *argv[]) argv += optind; if (argc > 3) { std::cerr << "Too many parameters\n"; - usage (argv[0]); + usage (progname); return (1); } char wdq_fname[MAX_INPUT_STR]; if (argc >= 1) - strncpy (wdq_fname, argv [1], MAX_INPUT_STR); + strncpy (wdq_fname, argv [0], MAX_INPUT_STR); else { std::cout << "Enter input WinDAQ filename: "; std::cin.getline (wdq_fname, MAX_INPUT_STR); @@ -142,7 +144,7 @@ main (int argc, char *argv[]) char channel_buf [MAX_INPUT_STR]; if (argc >= 2) - strncpy (channel_buf, argv[2], MAX_INPUT_STR); + strncpy (channel_buf, argv[1], MAX_INPUT_STR); else { std::cout << "Enter channel number: "; std::cin.getline (channel_buf, MAX_INPUT_STR); @@ -154,26 +156,26 @@ main (int argc, char *argv[]) std::ostringstream os; os << "Error: Channel " << channel_buf << " is not an integer"; error_msg (os.str().c_str()); - usage (argv[0]); + usage (progname); return (1); } char wav_fname[MAX_INPUT_STR]; if (argc >= 3) - strncpy (wav_fname, argv[3], MAX_INPUT_STR); + strncpy (wav_fname, argv[2], MAX_INPUT_STR); else { std::cout << "Enter output wav filename: "; std::cin.getline (wav_fname, MAX_INPUT_STR); } - if (! wdq2wav (wdq_fname, channel, wav_fname)) + if (! wdq2wav (wdq_fname, channel, wav_fname, play)) return 1; return 0; } bool -wdq2wav (const char* wdq_fname, const int channel, const char *wav_fname) +wdq2wav (const char* wdq_fname, const int channel, const char *wav_fname, bool play) { WindaqFile wdq (wdq_fname); @@ -251,6 +253,9 @@ wdq2wav (const char* wdq_fname, const int channel, const char *wav_fname) return false; } + if (play) + wav.Play(); + return true; } @@ -276,7 +281,9 @@ bool read_int2 (int fd, unsigned short int& n) tmp2 = tmp1; if (read (fd, &tmp1, 1) != 1) return false; + n = tmp2 + (tmp1 * 256); + return true; } bool read_int4 (int fd, unsigned int& n) @@ -288,7 +295,9 @@ bool read_int4 (int fd, unsigned int& n) tmp4 = tmp2; if (! read_int2 (fd, tmp2)) return false; + n = tmp4 + (tmp2 * 65536); + return true; } bool @@ -359,8 +368,8 @@ WindaqChannel::WindaqChannel (WindaqFile& wdq, const int channel) { if (wdq.m_valid) { if (channel >= 1 && channel <= wdq.m_nChannels) { - m_valid = true; - read_channel_data(); + if (read_channel_data()) + m_valid = true; } else { std::ostringstream os; os << "Channel " << channel << " is invalid, valid range 1-" << @@ -382,7 +391,7 @@ bool get_float8 (int fd, double& f) if (read (fd, &buf, 8) != 8) return false; -#ifdef BIG_ENDIAN +#if WORDS_BIG_ENDIAN unsigned char c; c = buf[0]; buf[0] = buf[7]; buf[7] = c; c = buf[1]; buf[1] = buf[6]; buf[6] = c; @@ -390,8 +399,9 @@ bool get_float8 (int fd, double& f) c = buf[3]; buf[3] = buf[4]; buf[4] = c; #endif - double* p = reinterpret_cast(buf); - f = *p; + f = *(reinterpret_cast(buf)); + + return true; } bool @@ -399,13 +409,9 @@ WindaqChannel::read_channel_data () { unsigned short int tmp2; unsigned int tmp4; - double float8; int fd = r_wdq.m_fd; - if (! m_valid) - return false; - m_data = new signed short int [r_wdq.m_nSamples * 2]; lseek (fd, r_wdq.m_channel_offset + 8 + @@ -414,7 +420,7 @@ WindaqChannel::read_channel_data () if (! get_float8 (fd, m_slope)) return false; - if (get_float8 (fd, m_intercept)) + if (! get_float8 (fd, m_intercept)) return false; char units[7]; @@ -442,7 +448,7 @@ WindaqChannel::read_channel_data () } signed short int v = *psample; -#ifdef BIG_ENDIAN +#if WORDS_BIG_ENDIAN unsigned char* p = reinterpret_cast(&v); unsigned char c = p[0]; p[0] = p[1]; p[1] = c; #endif @@ -492,10 +498,11 @@ WavFile::WavFile (WindaqChannel& wdq_channel, const char* fname) info_msg (os.str().c_str()); } - unsigned int nHeaderBytes = 44; - m_nFileBytes = nHeaderBytes + m_nSamples * m_nBytesPerSample; + m_nHeaderBytes = 44; + m_nDataBytes = m_nSamples * m_nBytesPerSample * m_nChannels; + m_nFileBytes = m_nHeaderBytes + m_nDataBytes; - unsigned int nHeaderShortInts = nHeaderBytes / sizeof(signed short int); + unsigned int nHeaderShortInts = m_nHeaderBytes / sizeof(signed short int); m_data = new signed short int [m_nSamples + nHeaderShortInts]; signed short int* input = wdq_channel.m_data; @@ -513,7 +520,7 @@ WavFile::WavFile (WindaqChannel& wdq_channel, const char* fname) value = (value + data_offset) * data_scale; value += 0.5 - 32768; signed short int v = static_cast(value); -#ifdef BIG_ENDIAN +#if WORDS_BIG_ENDIAN unsigned char* p = reinterpret_cast(&v); unsigned char c = p[0]; p[0] = p[1]; p[1] = c; #endif @@ -554,12 +561,11 @@ bool WavFile::fill_header () { char* pData = reinterpret_cast (m_data); - unsigned long data_bytes = m_nSamples * m_nBytesPerSample * m_nChannels; strncpy (pData, "RIFF", 4); // Length of file after 8 byte header - put_int4 (pData + 4, 36 + data_bytes); + put_int4 (pData + 4, 36 + m_nDataBytes); strncpy (pData + 8, "WAVEfmt ", 8); @@ -586,7 +592,7 @@ WavFile::fill_header () strncpy (pData + 36, "data", 4); - put_int4 (pData + 40, data_bytes); + put_int4 (pData + 40, m_nDataBytes); return true; } @@ -622,6 +628,70 @@ WavFile::WriteFile () return true; } +#ifdef WIN32 +#include +#include +#elif defined(LINUX) +#include +#include +#endif +bool +WavFile::Play () +{ +#ifdef WIN32 + if (PlaySound ((LPCSTR) m_data, 0, SND_MEMORY | SND_NODEFAULT)) + return true; +#elif defined(LINUX) + int fd; + if ((fd = open ("/dev/dsp",O_WRONLY)) == -1) { + error_msg ("Error opening /dev/dsp"); + return false; + } + int format = AFMT_S16_LE; + if (ioctl (fd, SNDCTL_DSP_SETFMT, &format) == -1) { + error_msg ("Error setting DSP format"); + close(fd); return false; + } + if (format != AFMT_S16_LE) { + error_msg ("DSP Format not set"); + close(fd); return false; + } + + int channels = m_nChannels; + if (ioctl (fd, SNDCTL_DSP_CHANNELS, &format) == -1) { + error_msg ("Error setting number of channels"); + close(fd); return false; + } + if (channels != m_nChannels) { + error_msg ("Number of channels not set"); + close(fd); return false; + } + + int speed = static_cast(m_rate + 0.5); + if (ioctl (fd, SNDCTL_DSP_SPEED, &speed) == -1) { + error_msg ("Error setting sample rate"); + close(fd); return false; + } + if (speed != m_rate && ! g_quiet) { + std::ostringstream os; + os << "Warning: Sample rate set to " << speed << ", not " << m_rate; + error_msg (os.str().c_str()); + } + + if (write (fd, reinterpret_cast(m_data) + m_nHeaderBytes, m_nDataBytes) != + m_nDataBytes) { + error_msg ("Error writing audio samples"); + close(fd); return false; + } + + close (fd); + return true; +#else +#endif + + return false; +} +